Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Util/CSoundClient.py
diff options
context:
space:
mode:
authorOli <olivier.belanger@umontreal.ca>2007-04-03 18:38:21 (GMT)
committer Oli <olivier.belanger@umontreal.ca>2007-04-03 18:38:21 (GMT)
commitbfe89f8ba35442b46d962eccb308129d7f3f6f18 (patch)
tree6e405d4995298cc0d15d3c07bee907dc1c93cdc2 /Util/CSoundClient.py
parent4f22d44bb08547ce3ef433b22357e36272781098 (diff)
fix tracks volume
Diffstat (limited to 'Util/CSoundClient.py')
-rw-r--r--Util/CSoundClient.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py
index 8f4a131..f4c8d84 100644
--- a/Util/CSoundClient.py
+++ b/Util/CSoundClient.py
@@ -48,7 +48,7 @@ class _CSoundClientPlugin:
def setTrackVolume( self, volume, trackId ):
self.trackVolume = volume
- sc_setTrackVolume(volume, trackId)
+ sc_setTrackVolume(volume, trackId+1)
def setTrackpadX( self, value ):
trackpadX = value
@@ -134,6 +134,7 @@ class _CSoundClientPlugin:
def loopUpdate(self, note, parameter, value,cmd):
page = note.page
+ track = note.track
id = note.id
if note.cs.mode == 'mini':
instrument_id_offset = 0
@@ -176,7 +177,7 @@ class _CSoundClientPlugin:
loopEnd = instrument.loopEnd
crossDur = instrument.crossDur
if (Config.DEBUG > 2): print 'INFO: updating instrument', (page<<16)+id, instrument.name, csoundInstId
- sc_loop_updateEvent( (page<<16)+id, 0, (csoundInstId + instrument_id_offset) + note.track * 0.01, cmd )
+ sc_loop_updateEvent( (page<<16)+id, 0, (csoundInstId + (track+1) + instrument_id_offset) + note.track * 0.01, cmd )
sc_loop_updateEvent( (page<<16)+id, 7, csoundTable, -1 )
sc_loop_updateEvent( (page<<16)+id, 12, loopStart, -1 )
sc_loop_updateEvent( (page<<16)+id, 13, loopEnd, -1 )
@@ -265,10 +266,9 @@ class _CSoundClientPlugin:
instrument_id_offset = 0
else:
instrument_id_offset = 100
-
a = array.array('f')
a.extend( [
- (instrument.csoundInstrumentId + trackId + instrument_id_offset) + trackId * 0.01,
+ (instrument.csoundInstrumentId + (trackId+1) + instrument_id_offset) + trackId * 0.01,
onset,
duration,
pitch,