diff options
author | Pootle Translation <pootle@dev.laptop.org> | 2008-05-27 04:30:07 (GMT) |
---|---|---|
committer | Pootle Translation <pootle@dev.laptop.org> | 2008-05-27 04:30:07 (GMT) |
commit | 8900ef5f0fcf5005234f25023acdced1a37387de (patch) | |
tree | 579559a2b4d3851865d91eab115e0cf78191f312 /common/Util/CSoundClient.py | |
parent | 89767dd1d5d472fc9f13139497ea575e30330af8 (diff) | |
parent | d898ded314ef368770fd8a01cb7ef8cef1065dd3 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'common/Util/CSoundClient.py')
-rw-r--r-- | common/Util/CSoundClient.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py index 69ed50f..2ce3238 100644 --- a/common/Util/CSoundClient.py +++ b/common/Util/CSoundClient.py @@ -79,26 +79,23 @@ class _CSoundClientPlugin: sc_inputMessage( Config.CSOUND_MIC_RECORD % table ) def load_mic_instrument( self, inst ): - fileName = Config.SNDS_DIR + '/' + inst + fileName = Config.DATA_DIR + '/' + inst instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[inst].instrumentId sc_inputMessage(Config.CSOUND_LOAD_INSTRUMENT % (instrumentId, fileName)) def load_synth_instrument( self, inst ): - fileName = Config.SNDS_DIR + '/' + inst + fileName = Config.DATA_DIR + '/' + inst instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[inst].instrumentId sc_inputMessage(Config.CSOUND_LOAD_INSTRUMENT % (instrumentId, fileName)) def load_ls_instrument( self, inst ): - fileName = Config.SNDS_DIR + '/' + inst + fileName = Config.DATA_DIR + '/' + inst sc_inputMessage(Config.CSOUND_LOAD_LS_INSTRUMENT % fileName) def load_instruments( self ): for instrumentSoundFile in self.instrumentDB.instNamed.keys(): if instrumentSoundFile[0:3] == 'mic' or instrumentSoundFile[0:3] == 'lab' or self.instrumentDB.instNamed[instrumentSoundFile].category == 'mysounds': - try: - fileName = Config.JAM_DIR + '/' + instrumentSoundFile - except: - fileName = Config.SNDS_DIR + '/' + instrumentSoundFile + fileName = Config.DATA_DIR + '/' + instrumentSoundFile else: fileName = Config.SOUNDS_DIR + "/" + instrumentSoundFile instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[ instrumentSoundFile ].instrumentId @@ -107,10 +104,7 @@ class _CSoundClientPlugin: def load_instrument(self, inst): if not inst in loadedInstruments: if inst[0:3] == 'mic' or inst[0:3] == 'lab' or self.instrumentDB.instNamed[inst].category == 'mysounds': - try: - fileName = Config.JAM_DIR + '/' + inst - except: - fileName = Config.SNDS_DIR + '/' + inst + fileName = Config.DATA_DIR + '/' + inst else: fileName = Config.SOUNDS_DIR + "/" + inst instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[ inst ].instrumentId |