keyboard fix

6 files changed, 17 insertions, 9 deletions

diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index 16836b8..352d247 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -325,6 +325,7 @@ class miniTamTamMain(gtk.EventBox):
                     print 'ERROR: failed to load Sound from file %s' % chooser.get_filename()
             chooser.destroy()
             results = commands.getstatusoutput("csound -U sndinfo %s" % tempName)
+            #print results
             if results[0] == 0:
                 list = results[1].split()
                 pos = list.index('seconds')
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 ):
diff --git a/common/Resources/tamtamorc.csd b/common/Resources/tamtamorc.csd
index de2f24a..c73e276 100644
--- a/common/Resources/tamtamorc.csd
+++ b/common/Resources/tamtamorc.csd
@@ -1067,8 +1067,6 @@ gainrev	=	    a1*p5+gainrev
 
 endin
 
-
-
 </CsInstruments>
 <CsScore>
 f1 0 8192 10 1
diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py
index af1124d..bdd6e97 100644
--- a/common/Util/CSoundClient.py
+++ b/common/Util/CSoundClient.py
@@ -45,7 +45,7 @@ class _CSoundClientPlugin:
                 Config.PLUGIN_VERBOSE,
                 Config.PLUGIN_KSMPS, Config.PLUGIN_RATE)
         self.on = False
-        #self.masterVolume = 80.0
+        #self.masterVolume = 100.0
         self.periods_per_buffer = 2
         global _loop_default
         _loop_default = self.loopCreate()
diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py
index e866861..3c1922d 100644
--- a/common/Util/LoopSettings.py
+++ b/common/Util/LoopSettings.py
@@ -80,7 +80,7 @@ class LoopSettings( gtk.VBox ):
 
         startBox = gtk.VBox()
         self.startAdjust = gtk.Adjustment( 0.01, 0, 1., .001, .001, 0)
-        self.GUI['startSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.startAdjust, 7 )
+        self.GUI['startSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/common/Resources/Images/sliderEditVolume.png", self.startAdjust, 7 )
         self.startAdjust.connect("value-changed", self.handleStart)
         self.GUI['startSlider'].set_inverted(True)
         self.GUI['startSlider'].set_size_request(50, 200)
@@ -93,7 +93,7 @@ class LoopSettings( gtk.VBox ):
 
         endBox = gtk.VBox()
         self.endAdjust = gtk.Adjustment( 0.9, 0, 1, .001, .001, 0)
-        self.GUI['endSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.endAdjust, 7 )
+        self.GUI['endSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/common/Resources/Images/sliderEditVolume.png", self.endAdjust, 7 )
         self.endAdjust.connect("value-changed", self.handleEnd)
         self.GUI['endSlider'].set_inverted(True)
         self.GUI['endSlider'].set_size_request(50, 200)
@@ -106,7 +106,7 @@ class LoopSettings( gtk.VBox ):
 
         durBox = gtk.VBox()
         self.durAdjust = gtk.Adjustment( 0.01, 0, 0.2, .001, .001, 0)
-        self.GUI['durSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.durAdjust, 7 )
+        self.GUI['durSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/common/Resources/Images/sliderEditVolume.png", self.durAdjust, 7 )
         self.durAdjust.connect("value-changed", self.handleDur)
         self.GUI['durSlider'].set_inverted(True)
         self.GUI['durSlider'].set_size_request(50, 200)