Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam

5 files changed, 10 insertions, 6 deletions

diff --git a/Config.py b/Config.py
index f540a5b..e14dec2 100644
--- a/Config.py
+++ b/Config.py
@@ -403,9 +403,9 @@ ModKeys = _ModKeys()
 ############
 
 #DEFAULTS
-PLAYER_TEMPO = 120
-PLAYER_TEMPO_LOWER = 40
-PLAYER_TEMPO_UPPER = 200
+PLAYER_TEMPO = 100
+PLAYER_TEMPO_LOWER = 30
+PLAYER_TEMPO_UPPER = 180
 DEFAULT_VOLUME = 80
 
 #NUMERICAL CONSTANTS
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 4f9ef5b..6ca4a46 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -810,7 +810,6 @@ class MainWindow( SubActivity ):
                              pan = 0.5, 
                              duration = 20, 
                              trackId = 1, 
-                             fullDuration = False, 
                              instrumentId = Config.INSTRUMENTS[instrumentName].instrumentId, 
                              reverbSend = 0),
                     secs_per_tick)
@@ -1287,7 +1286,6 @@ class MainWindow( SubActivity ):
                                             pan = 0.5,
                                             duration = duration,
                                             trackId = track,
-                                            fullDuration = False,
                                             instrument = instrument,
                                             instrumentFlag = instrument)
             self.kb_keydict[key].playNow()
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index 900e6ba..91e6311 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -797,7 +797,9 @@ kvol chnget SvolTrackName1
 kvol = kvol * 0.01
 kvol port kvol, .01
 
+if p3 == 0 then
 p3      =   nsamp(p8) * giScale / p4
+endif
 
 a1      loscil  p6, p4, p8, 1
 
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py
index d5f7e30..33e7359 100644
--- a/Util/CSoundClient.py
+++ b/Util/CSoundClient.py
@@ -223,6 +223,11 @@ class _CSoundClientPlugin:
         elif instrument.csoundInstrumentId == Config.INST_TIED and mode == 'edit':
             instrument_offset = 100
 
+        if instrument.csoundInstrumentId == Config.INST_SIMP and mode == 'mini':
+            duration = 0
+        elif instrument.csoundInstrumentId == Config.INST_SIMP and mode == 'edit':
+            duration = duration 
+
         a = array.array('f')
         a.extend( [
                  (instrument.csoundInstrumentId + trackId + instrument_offset) + trackId * 0.01,
diff --git a/Util/ThemeWidgets.py b/Util/ThemeWidgets.py
index 5c1bca2..64d43a4 100644
--- a/Util/ThemeWidgets.py
+++ b/Util/ThemeWidgets.py
@@ -87,7 +87,6 @@ widget "*%s*" style "scale_style"
         else:
             sliderX = int((self.alloc.width - self.pixbufWidth)*(val-adj.lower)/(adj.upper - adj.lower))
 
-        print self.alloc.width, self.pixbufWidth, adj.upper, adj.lower, val
         if self.insensitivePixbuf != None and self.state == gtk.STATE_INSENSITIVE:
             self.window.draw_pixbuf( gc, self.insensitivePixbuf, 0, 0, self.alloc.x + sliderX, self.alloc.y + self.sliderY, self.pixbufWidth, self.pixbufHeight, gtk.gdk.RGB_DITHER_NORMAL, 0, 0 )
         else: