SynthLab and Mini fine tunning

3 files changed, 42 insertions, 38 deletions

diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
index 0fcda29..88367c6 100755
--- a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
@@ -48,8 +48,8 @@ class SynthLabConstants:
     INTEGER = [1, 0]
 
     # s1 s2 s3 s4 s1min s1max s2min s2max s3min s3max s4min s4max [s1step s1digits] [s2step s2digits] [s3step s3digits]
-    TYPES = {   'lfo': [.5, 1, 0, 0, 0, 1, 0, 20, 0, 5, 0, 1,  FLOAT, FLOAT, INTEGER],
-                'rand': [.5, 1.5, 2, 0, 0, 2, 0, 2, 0, 20, 0, 1, FLOAT, FLOAT, FLOAT],
+    TYPES = {   'lfo': [.1, 5, 0, 1, 0, 1, 0, 50, 0, 5, 0, 1,  FLOAT, FLOAT, INTEGER],
+                'rand': [.5, 1.5, 2, 0, 0, 2, 0, 2, 0, 50, 0, 1, FLOAT, FLOAT, FLOAT],
                 'adsr': [.02, .05, .8, .1, 0, 1, 0, 1, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
                 'trackpadX': [0, 1, 0, 0, -1, 1, 0, 2, 0, 1, 0, 1, FLOAT, FLOAT, INTEGER],
                 'trackpadY': [0, 1, 0, 0, -1, 1, 0, 2, 0, 1, 0, 1, FLOAT, FLOAT, INTEGER],
@@ -58,9 +58,9 @@ class SynthLabConstants:
                 'vco': [1, 1, .2, 1, 0, 2, 0, 2, 0, .5, 0, 2, FLOAT, INTEGER, FLOAT],
                 'pluck': [1, 5000, 0, 1, 0, 2, 100, 8000, 0, 8, 0, 2, FLOAT, INTEGER, FLOAT],
                 'noise': [0, 3000, 4000, 1, 0, 2, 0, 8000, 0, 6000, 0, 2, INTEGER, INTEGER,INTEGER],
-                'sample': [1, 5, 5000, 1, 0, 2, 0, 99, 100, 8000, 0, 2, FLOAT, INTEGER, INTEGER],
+                'sample': [1, 15, 5000, 1, 0, 2, 0, 99, 100, 8000, 0, 2, FLOAT, INTEGER, INTEGER],
                 'voice': [1, 3, 5, 1, 0, 2, 0, 8, 1, 10, 0, 2, FLOAT, INTEGER, FLOAT],
-                'grain': [1, 4, 1, 1, 0, 2, 0, 99, 0, 1, 0, 2, FLOAT, INTEGER, FLOAT],
+                'grain': [1, 15, 1, 1, 0, 2, 0, 99, 0, 1, 0, 2, FLOAT, INTEGER, FLOAT],
                 'addSynth': [1, .005, 5, 1, 0, 2, 0, 20, 0, 9, 0, 2, FLOAT, FLOAT, INTEGER],
                 'mic': [5, 1, 1, 1, 1, 10, 1, 4, 0, 4, 0, 2, FLOAT, INTEGER, FLOAT],
                 'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 0, 1, 0, 2, FLOAT1, INTEGER, FLOAT],
@@ -100,7 +100,7 @@ class SynthLabConstants:
     LFO_PARA1 = _('The volume of the LFO wave. More volume means more effect.')
     LFO_PARA2 = _('The speed of the wave.')
     LFO_PARA3 = _('The type of wave that will be used for the LFO.')
-    LFO_PARA4 = _('The time by which the LFO is delayed.')
+    LFO_PARA4 = _('The value added to the amplitude of the LFO.')
 
     RANDOM = _('Random')
     MIN = _('Minimum')
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index ace1a9d..69d8340 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -176,6 +176,7 @@ class SynthLabMain(gtk.EventBox):
         self.p1Adjust.connect("value-changed", self.sendTables, 1)
         self.slider1 = gtk.VScale(self.p1Adjust)
         self.slider1.connect("button-release-event", self.handleSliderRelease)
+        self.slider1.connect("value-changed", self.handleSliderRelease)
         self.slider1.connect("enter-notify-event", self.handleSliderEnter, 1)
         self.slider1.set_digits(slider1Snap)
         self.slider1.set_inverted(True)
@@ -187,6 +188,7 @@ class SynthLabMain(gtk.EventBox):
         self.p2Adjust.connect("value-changed", self.sendTables, 2)
         self.slider2 = gtk.VScale(self.p2Adjust)
         self.slider2.connect("button-release-event", self.handleSliderRelease)
+        self.slider2.connect("value-changed", self.handleSliderRelease)
         self.slider2.connect("enter-notify-event", self.handleSliderEnter, 2)
         self.slider2.set_digits(slider2Snap)
         self.slider2.set_inverted(True)
@@ -198,6 +200,7 @@ class SynthLabMain(gtk.EventBox):
         self.p3Adjust.connect("value-changed", self.sendTables, 3)
         self.slider3 = gtk.VScale(self.p3Adjust)
         self.slider3.connect("button-release-event", self.handleSliderRelease)
+        self.slider3.connect("value-changed", self.handleSliderRelease)
         self.slider3.connect("enter-notify-event", self.handleSliderEnter, 3)
         self.slider3.set_digits(slider3Snap)
         self.slider3.set_inverted(True)
@@ -209,6 +212,7 @@ class SynthLabMain(gtk.EventBox):
         self.p4Adjust.connect("value-changed", self.sendTables, 4)
         self.slider4 = gtk.VScale(self.p4Adjust)
         self.slider4.connect("button-release-event", self.handleSliderRelease)
+        self.slider4.connect("value-changed", self.handleSliderRelease)
         self.slider4.connect("enter-notify-event", self.handleSliderEnter, 4)
         self.slider4.set_digits(2)
         self.slider4.set_inverted(True)
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
index 7b995b5..5dd6334 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
@@ -11,17 +11,17 @@ from gettext import gettext as _
 class mainToolbar(gtk.Toolbar):
     def __init__(self,toolbox, synthLab):
         gtk.Toolbar.__init__(self)
-        
+
         def _insertSeparator(x = 1):
             for i in range(x):
                 self.separator = gtk.SeparatorToolItem()
                 self.separator.set_draw(False)
                 self.insert(self.separator,-1)
-                self.separator.show()        
-            
+                self.separator.show()
+
         self.toolbox = toolbox
         self.synthLab = synthLab
-        
+
         self.tooltips = gtk.Tooltips()
 
         self.durationSliderLabel = gtk.Label(_('Duration:  '))
@@ -48,121 +48,121 @@ class mainToolbar(gtk.Toolbar):
         self.durationSlider.show()
         self.durationSliderTool.show()
         self.durationSliderTool.set_tooltip(self.tooltips, _('Duration'))
-        
+
         _insertSeparator(1)
-        
+
         self.synthRec1Button = ToggleToolButton('rec1')
         self.synthRec1Button.connect('clicked',self.synthLab.recordSound,1)
         self.insert(self.synthRec1Button, -1)
         self.synthRec1Button.show()
-        self.synthRec1Button.set_tooltip(_('Record Synth sound into slot 1'))
-        
+        self.synthRec1Button.set_tooltip(_('Record Synth sound into slot "lab1"'))
+
         self.synthRec2Button = ToggleToolButton('rec2')
         self.synthRec2Button.connect('clicked',self.synthLab.recordSound,2)
         self.insert(self.synthRec2Button, -1)
         self.synthRec2Button.show()
-        self.synthRec2Button.set_tooltip(_('Record Synth sound into slot 2'))
-        
+        self.synthRec2Button.set_tooltip(_('Record Synth sound into slot "lab2"'))
+
         self.synthRec3Button = ToggleToolButton('rec3')
         self.synthRec3Button.connect('clicked',self.synthLab.recordSound,3)
         self.insert(self.synthRec3Button, -1)
         self.synthRec3Button.show()
-        self.synthRec3Button.set_tooltip(_('Record Synth sound into slot 3'))
-        
+        self.synthRec3Button.set_tooltip(_('Record Synth sound into slot "lab3"'))
+
         self.synthRec4Button = ToggleToolButton('rec4')
         self.synthRec4Button.connect('clicked',self.synthLab.recordSound,4)
         self.insert(self.synthRec4Button, -1)
         self.synthRec4Button.show()
-        self.synthRec4Button.set_tooltip(_('Record Synth sound into slot 4'))
-        
+        self.synthRec4Button.set_tooltip(_('Record Synth sound into slot "lab4"'))
+
         self.synthRec5Button = ToggleToolButton('rec5')
         self.synthRec5Button.connect('clicked',self.synthLab.recordSound,5)
         self.insert(self.synthRec5Button, -1)
         self.synthRec5Button.show()
-        self.synthRec5Button.set_tooltip(_('Record Synth sound into slot 5'))
-        
+        self.synthRec5Button.set_tooltip(_('Record Synth sound into slot "lab5"'))
+
         self.synthRec6Button = ToggleToolButton('rec6')
         self.synthRec6Button.connect('clicked',self.synthLab.recordSound,6)
         self.insert(self.synthRec6Button, -1)
         self.synthRec6Button.show()
-        self.synthRec6Button.set_tooltip(_('Record Synth sound into slot 6'))
-        
+        self.synthRec6Button.set_tooltip(_('Record Synth sound into slot "lab6"'))
+
         _insertSeparator(1)
-        
+
         self.resetButton = ToolButton('sl-reset')
         self.resetButton.connect('clicked',self.synthLab.handleReset)
         self.insert(self.resetButton, -1)
         self.resetButton.show()
         self.resetButton.set_tooltip(_('Reset the worktable'))
-        
+
 class presetToolbar(gtk.Toolbar):
     def __init__(self,toolbox, synthLab):
         gtk.Toolbar.__init__(self)
-        
+
         def _insertSeparator(x = 1):
             for i in range(x):
                 self.separator = gtk.SeparatorToolItem()
                 self.separator.set_draw(False)
                 self.insert(self.separator,-1)
-                self.separator.show()          
-            
+                self.separator.show()
+
         self.toolbox = toolbox
         self.synthLab = synthLab
-        
+
         self.preset1Button = RadioToolButton('preset1', group = None)
         self.preset1Button.connect('clicked',self.synthLab.presetCallback,1)
         self.insert(self.preset1Button, -1)
         self.preset1Button.show()
         self.preset1Button.set_tooltip(_('Preset 1'))
-        
+
         self.preset2Button = RadioToolButton('preset2', group = self.preset1Button)
         self.preset2Button.connect('clicked',self.synthLab.presetCallback,2)
         self.insert(self.preset2Button, -1)
         self.preset2Button.show()
         self.preset2Button.set_tooltip(_('Preset 2'))
-        
+
         self.preset3Button = RadioToolButton('preset3', group = self.preset1Button)
         self.preset3Button.connect('clicked',self.synthLab.presetCallback,3)
         self.insert(self.preset3Button, -1)
         self.preset3Button.show()
         self.preset3Button.set_tooltip(_('Preset 3'))
-        
+
         self.preset4Button = RadioToolButton('preset4', group = self.preset1Button)
         self.preset4Button.connect('clicked',self.synthLab.presetCallback,4)
         self.insert(self.preset4Button, -1)
         self.preset4Button.show()
         self.preset4Button.set_tooltip(_('Preset 4'))
-        
+
         self.preset5Button = RadioToolButton('preset5', group = self.preset1Button)
         self.preset5Button.connect('clicked',self.synthLab.presetCallback,5)
         self.insert(self.preset5Button, -1)
         self.preset5Button.show()
         self.preset5Button.set_tooltip(_('Preset 5'))
-        
+
         self.preset6Button = RadioToolButton('preset6', group = self.preset1Button)
         self.preset6Button.connect('clicked',self.synthLab.presetCallback,6)
         self.insert(self.preset6Button, -1)
         self.preset6Button.show()
         self.preset6Button.set_tooltip(_('Preset 6'))
-        
+
         self.preset7Button = RadioToolButton('preset7', group = self.preset1Button)
         self.preset7Button.connect('clicked',self.synthLab.presetCallback,7)
         self.insert(self.preset7Button, -1)
         self.preset7Button.show()
         self.preset7Button.set_tooltip(_('Preset 7'))
-        
+
         self.preset8Button = RadioToolButton('preset8', group = self.preset1Button)
         self.preset8Button.connect('clicked',self.synthLab.presetCallback,8)
         self.insert(self.preset8Button, -1)
         self.preset8Button.show()
         self.preset8Button.set_tooltip(_('Preset 8'))
-        
+
         self.preset9Button = RadioToolButton('preset9', group = self.preset1Button)
         self.preset9Button.connect('clicked',self.synthLab.presetCallback,9)
         self.insert(self.preset9Button, -1)
         self.preset9Button.show()
         self.preset9Button.set_tooltip(_('Preset 9'))
-        
+
         self.preset10Button = RadioToolButton('preset10', group = self.preset1Button)
         self.preset10Button.connect('clicked',self.synthLab.presetCallback,10)
         self.insert(self.preset10Button, -1)