synthLabParametersWindow and track volumes

3 files changed, 22 insertions, 13 deletions

diff --git a/SynthLab/Parameter.py b/SynthLab/Parameter.py
index add1d21..4a7a519 100644
--- a/SynthLab/Parameter.py
+++ b/SynthLab/Parameter.py
@@ -13,7 +13,7 @@ class Parameter( gtk.Window ):
         self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
         color = gtk.gdk.color_parse(Config.INST_BCK_COLOR)
         self.modify_bg(gtk.STATE_NORMAL, color)
-        self.move(15, 660)
+        self.move(15, 650)
         self.set_size_request(450, 40)
         self.set_decorated(False)
         mainBox = RoundHBox(fillcolor=Config.INST_BCK_COLOR, bordercolor=Config.INST_BCK_COLOR)
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index 45aff9f..243d70a 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -7,14 +7,14 @@ from Util.ThemeWidgets import *
 from SynthLab.SynthLabConstants import SynthLabConstants
 from SynthLab.Parameter import Parameter
 from Util.Trackpad import Trackpad
+from  Util.CSoundClient import new_csound_client
 
 Tooltips = Config.Tooltips
 
 class SynthLabParametersWindow( gtk.Window ):
-    def __init__( self, instanceID, synthObjectsParameters, writeTables, playNoteFunction, client ):
+    def __init__( self, instanceID, synthObjectsParameters, writeTables, playNoteFunction ):
         gtk.Window.__init__( self, gtk.WINDOW_TOPLEVEL )
         self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-        self.set_title("SynthLab Parameters")
         self.set_position( gtk.WIN_POS_CENTER )
         self.set_default_size(30, 300)
         self.set_border_width(0)
@@ -28,13 +28,14 @@ class SynthLabParametersWindow( gtk.Window ):
         self.add_events(gtk.gdk.KEY_RELEASE_MASK)
         self.connect("key-press-event", self.onKeyPress)
         self.connect("key-release-event", self.onKeyRelease)
+        self.connect('focus_in_event',self.onFocusIn)
+        self.connect('focus_out_event',self.onFocusOut)
         self.instanceID = instanceID
         self.objectType = self.instanceID / 4
         self.synthObjectsParameters = synthObjectsParameters
         self.writeTables = writeTables
         self.playNoteFunction = playNoteFunction
-        self.csnd = client
-        self.trackpad = Trackpad( self, self.csnd )
+        self.trackpad = Trackpad( self )
         self.playingPitch = []
         self.parameterOpen = 0
         self.clockStart = 0
@@ -136,6 +137,16 @@ class SynthLabParametersWindow( gtk.Window ):
         self.add(self.mainBox)
         self.show_all()
 
+    def onFocusIn(self, event, data=None):
+        print 'DEBUG: Params Window::onFocusIn'
+        csnd = new_csound_client()
+        csnd.connect(True)
+ 
+    def onFocusOut(self, event, data=None):
+        print 'DEBUG: Params Window::onFocusOut'
+
+
+
     def destroy( self, data=None ):
         self.hide()
 
@@ -146,6 +157,7 @@ class SynthLabParametersWindow( gtk.Window ):
         midiPitch = Config.KEY_MAP[key]
         if midiPitch not in self.playingPitch:
             self.playingPitch.append( midiPitch )
+            print midiPitch
             self.playNoteFunction( midiPitch, 0 )
             
     def onKeyRelease( self, widget, event ):
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index 3f3fd26..d7b7d2f 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -32,7 +32,7 @@ class SynthLabWindow(SubActivity):
             self.set_keep_above(False)
             self.set_decorated(False)
         self.csnd = new_csound_client()
-        self.trackpad = Trackpad( self, self.csnd )
+        self.trackpad = Trackpad( self )
         self.table = table
         self.synthObjectsParameters = SynthObjectsParameters()
         self.resetLocations()
@@ -178,16 +178,15 @@ class SynthLabWindow(SubActivity):
         self.tooltips.set_tip(resetButton, Tooltips.RESET)
         self.tooltips.set_tip(closeButton, Tooltips.CLOSE)
         self.add(self.mainBox)
+        self.tooltips.set_tip(self.durationSlider, Tooltips.SOUNDDUR + ': ' + self.durString)
         tempFile = 'synthTemp' + str(self.table - 85)
         if tempFile in os.listdir(Config.PREF_DIR):
             self.handleLoadTemp()
         else:
             self.presetCallback(self.presets,0)
-
-        self.tooltips.set_tip(self.durationSlider, Tooltips.SOUNDDUR + ': ' + self.durString)
-
+ 
         self.show_all()
-    
+ 
     def onDestroy(self):
         pass
 
@@ -201,9 +200,7 @@ class SynthLabWindow(SubActivity):
                 self.playingPitch.append( midiPitch )
                 self.playNote( midiPitch, 0 )
             else:
-                #self.csnd.inputMessage("i5204 0.02 4 " + str(self.table) )
                 self.recordWait = 0
-                #time.sleep(0.02)
                 self.playingPitch.append( midiPitch )
                 self.playNote( midiPitch, self.table )
                 self.waitRecording()	
@@ -353,7 +350,7 @@ class SynthLabWindow(SubActivity):
                 if self.bounds[i][0] < event.x < self.bounds[i][2] and self.bounds[i][1] < event.y < self.bounds[i][3]:
                     if self.instanceOpen:
                         self.synthLabParametersWindow.destroy()
-                    self.synthLabParametersWindow = SynthLabParametersWindow( i, self.synthObjectsParameters, self.writeTables, self.playNote, self.csnd )
+                    self.synthLabParametersWindow = SynthLabParametersWindow( i, self.synthObjectsParameters, self.writeTables, self.playNote )
                     self.instanceOpen = 1
 
     def handleMotion( self, widget, event ):