diff options
| author | amartin <olpc@localhost.localdomain> | 2007-01-08 06:28:57 (GMT) |
|---|---|---|
| committer | amartin <olpc@localhost.localdomain> | 2007-01-08 06:28:57 (GMT) |
| commit | 10621ebbb7a9a63bd738626df28f103f3ce17b3f (patch) | |
| tree | 773cad069f3205062508ce62dabcce5ac8dd08cd /Util/NoteLooper.py | |
| parent | 81d464fb6bd13f9a93b52b90d537afc3b391f322 (diff) | |
more cleanup
sliders in edit mode
Diffstat (limited to 'Util/NoteLooper.py')
| -rw-r--r-- | Util/NoteLooper.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Util/NoteLooper.py b/Util/NoteLooper.py index d355303..5f1f94f 100644 --- a/Util/NoteLooper.py +++ b/Util/NoteLooper.py @@ -7,10 +7,9 @@ pygtk.require( '2.0' ) import gtk import gobject -from Framework.Constants import Constants -from Framework.CSound.CSoundConstants import CSoundConstants -from Framework.Generation.GenerationConstants import GenerationConstants -from Framework.Core.Profiler import TP +import Config +from Generation.GenerationConstants import GenerationConstants +from Util.Profiler import TP #------------------------------------------------------------------------------ # A base class used to play a collection of Events at their respective onsets @@ -101,24 +100,24 @@ class NoteLooper: if pitch in GenerationConstants.DRUMPITCH: pitch = GenerationConstants.DRUMPITCH[ pitch ] - iflag = CSoundConstants.DRUM1INSTRUMENTS[ pitch ] + iflag = Config.DRUM1INSTRUMENTS[ pitch ] pitch = 1 else: iflag = self.inst[ trackId ] pitch = GenerationConstants.TRANSPOSE[ pitch - 24 ] # condition for tied notes - if CSoundConstants.INSTRUMENTS[ iflag ].csoundInstrumentID == 101 and tied and fullDuration: + if Config.INSTRUMENTS[ iflag ].csoundInstrumentID == 101 and tied and fullDuration: duration= -1.0 # condition for overlaped notes - if CSoundConstants.INSTRUMENTS[ iflag ].csoundInstrumentID == 102 and overlap: + if Config.INSTRUMENTS[ iflag ].csoundInstrumentID == 102 and overlap: duration += 1.0 attack = max( 0.002, duration * attack) decay = max( 0.002, duration * decay) - rval = CSoundConstants.PLAY_NOTE_COMMAND_MINUS_DELAY % \ - ( CSoundConstants.INSTRUMENTS[ iflag ].csoundInstrumentID, + rval = Config.PLAY_NOTE_COMMAND_MINUS_DELAY % \ + ( Config.INSTRUMENTS[ iflag ].csoundInstrumentID, trackId, '%f', #delay, duration, @@ -126,7 +125,7 @@ class NoteLooper: reverbSend, amplitude, pan, - CSoundConstants.INSTRUMENT_TABLE_OFFSET + CSoundConstants.INSTRUMENTS[ iflag ].instrumentID, + Config.INSTRUMENT_TABLE_OFFSET + Config.INSTRUMENTS[ iflag ].instrumentID, attack, decay, filterType, filterCutoff ) |