diff options
| author | James <olpc@localhost.localdomain> | 2007-02-28 02:16:35 (GMT) |
|---|---|---|
| committer | James <olpc@localhost.localdomain> | 2007-02-28 02:16:35 (GMT) |
| commit | 63896fe4894554d4ed3f769c62755d88bee3f201 (patch) | |
| tree | 64e1ecb21848db3f23c1e959ea99c6fa70f2e2a4 /Util/CSoundClient.py | |
| parent | 23b868606bb363d10499be3a09128c088f950421 (diff) | |
| parent | da65555ea722c1a71c6c64704aeeb29640f561f9 (diff) | |
merge
Diffstat (limited to 'Util/CSoundClient.py')
| -rw-r--r-- | Util/CSoundClient.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py index ad68a0b..c2b5a9f 100644 --- a/Util/CSoundClient.py +++ b/Util/CSoundClient.py @@ -17,7 +17,7 @@ class _CSoundClientPlugin: def __init__(self, orc): sc_initialize(orc) self.on = False - self.masterVolume = 80.0 + #self.masterVolume = 80.0 self.periods_per_buffer = 2 def __del__(self): @@ -26,10 +26,14 @@ class _CSoundClientPlugin: def setMasterVolume(self, volume): - self.masterVolume = volume + #self.masterVolume = volume if self.on: sc_setMasterVolume(volume) + def setTrackVolume( self, volume, trackId ): + self.trackVolume = volume + sc_setTrackVolume(volume, trackId) + def setTrackpadX( self, value ): trackpadX = value sc_setTrackpadX(trackpadX) @@ -244,7 +248,7 @@ class _CSoundClientPlugin: a = array.array('f') a.extend( [ - Config.INSTRUMENTS[ instr ].csoundInstrumentId + trackId * 0.01, + (Config.INSTRUMENTS[ instr ].csoundInstrumentId + trackId) + trackId * 0.01, onset, duration, pitch, |