Jamgit-update-index scripts/update-activity.sh git-update-index scripts/update-activity.sh

3 files changed, 29 insertions, 3 deletions

diff --git a/Jam/Jam.py b/Jam/Jam.py
new file mode 100644
index 0000000..a003311
--- /dev/null
+++ b/Jam/Jam.py
@@ -0,0 +1,18 @@
+from SubActivity import SubActivity
+    
+class miniTamTamMain(SubActivity):
+    
+    def __init__(self, activity, set_mode):
+        SubActivity.__init__(self, set_mode)
+
+        self.activity = activity
+
+
+    def onActivate( self, arg ):
+        pass
+
+    def onDeactivate( self ):
+        pass
+
+    def onDestroy( self ):
+        pass
diff --git a/TamTam.py b/TamTam.py
index b8fdfa3..71bd2fe 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -13,6 +13,7 @@ from   Util.Profiler import TP
 
 from   Util.InstrumentPanel import InstrumentPanel
 from   miniTamTam.miniTamTamMain import miniTamTamMain
+from   Jam.Jam import Jam
 from   Edit.MainWindow import MainWindow
 from   Welcome import Welcome
 from   SynthLab.SynthLabWindow import SynthLabWindow
@@ -128,6 +129,10 @@ class TamTam(Activity):
             self.predrawTimeout = False
  
 
+        if mode == 'jam':
+            if not (mode in self.modeList):
+                self.modeList[mode] = Jam(self, self.set_mode)
+            self.mode = mode
         if mode == 'mini':
             self.toolbox.hide()
             if not (mode in self.modeList):
@@ -177,10 +182,13 @@ class TamTam(Activity):
         csnd.connect(False)
 
     def onKeyPress(self, widget, event):
-        if Config.DEBUG > 5: print 'DEBUG: TamTam::onKeyPress in TamTam.py'
+        if Config.DEBUG > 1: print 'DEBUG: TamTam::onKeyPress in TamTam.py'
         if event.state == gtk.gdk.MOD1_MASK:
             key = event.hardware_keycode
-            if key == 58:    #M
+            if key == 100: # J
+                self.set_mode("jam")
+                return
+            elif key == 58:    #M
                 self.set_mode('mini')
                 return
             elif key == 49:#39:  S
diff --git a/scripts/update-activity.sh b/scripts/update-activity.sh
index c5b625f..624ad45 100755
--- a/scripts/update-activity.sh
+++ b/scripts/update-activity.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 DEST=/usr/share/activities/TamTam.activity
 SRC=.
-PYTHON_DIR=" . Edit miniTamTam Util SynthLab Generation Resources "
+PYTHON_DIR=" . Jam Edit miniTamTam Util SynthLab Generation Resources "
 OTHER_DIRS=" "
 FILES="Util/Clooper/aclient.so Resources/crop.csd Resources/univorc.csd "
 for DIR in $PYTHON_DIR ; do