2 files changed, 12 insertions, 3 deletions
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index b5e330f..9cca171 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -35,6 +35,7 @@ class SynthLabMain(gtk.EventBox):
             self.set_decorated(False)
         self.activity = activity
         self.csnd = new_csound_client()
+        self.csnd.setMasterVolume( 100.0 ) # csnd expects a range 0-100 for now
         self.trackpad = Trackpad( self )
         self.synthObjectsParameters = SynthObjectsParameters()
         self.resetLocations()
@@ -292,6 +293,11 @@ class SynthLabMain(gtk.EventBox):
         self.add(self.mainBox)
         self.show_all()
 
+    def onActivate( self, arg ):
+        pass
+    def onDeactivate( self ):
+        pass
+
     def onDestroy(self):
         pass
 
@@ -454,6 +460,7 @@ class SynthLabMain(gtk.EventBox):
 
     def onKeyPress(self,widget,event):
         key = event.hardware_keycode
+
         if key not in Config.KEY_MAP:
             return
         midiPitch = Config.KEY_MAP[key]
diff --git a/TamTamSynthLab.activity/TamTamSynthLab.py b/TamTamSynthLab.activity/TamTamSynthLab.py
index 1381a65..2fdd6aa 100644
--- a/TamTamSynthLab.activity/TamTamSynthLab.py
+++ b/TamTamSynthLab.activity/TamTamSynthLab.py
@@ -37,8 +37,6 @@ class TamTamSynthLab(activity.Activity):
         self.focusOutHandler = self.connect('focus_out_event',self.onFocusOut)
         self.connect('notify::active', self.onActive)
         self.connect('destroy', self.onDestroy)
-        self.connect( "key-press-event", self.onKeyPress )
-        self.connect( "key-release-event", self.onKeyRelease )
 
         #load the sugar toolbar
         self.toolbox = activity.ActivityToolbox(self)
@@ -53,9 +51,13 @@ class TamTamSynthLab(activity.Activity):
         self.trackpad.setContext('synthLab')
         self.synthLab = SynthLabMain(self)
 
+        self.connect( "key-press-event", self.synthLab.onKeyPress )
+        self.connect( "key-release-event", self.synthLab.onKeyRelease )
+
+
         self.set_canvas( self.synthLab )
  
-        #self.synthLab.onActivate(arg = None)
+        self.synthLab.onActivate(arg = None)
         self.show()
 
     def onPreloadTimeout( self ):