diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2008-05-23 15:15:58 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2008-05-23 15:15:58 (GMT) |
| commit | 1f827299ad820c1ca6f7ea6cde29cb702f89ad7e (patch) | |
| tree | ce8a1663a5a099d3598ca78d1f370eff0facffa3 /common/Util | |
| parent | 4fddb1ff0ada13fd31ddad5e2ae61dcd192664fc (diff) | |
security model, cleanup, SynthLab to OGG
Diffstat (limited to 'common/Util')
| -rw-r--r-- | common/Util/CSoundClient.py | 16 | ||||
| -rw-r--r-- | common/Util/LoopSettings.py | 2 |
2 files changed, 6 insertions, 12 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 diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py index f389275..d672050 100644 --- a/common/Util/LoopSettings.py +++ b/common/Util/LoopSettings.py @@ -152,7 +152,7 @@ class LoopSettings( gtk.VBox ): ofile.write(name + ' ' + tied + ' ' + register + ' ' + melo + ' ' + category + ' ' + start + ' ' + end + ' ' + dur + '\n') ofile.close() - (s,o) = commands.getstatusoutput('cp ' + Config.SNDS_DIR + '/' + self.oldName + ' ' + Config.SNDS_DIR + '/' + name) + (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + self.oldName + ' ' + Config.DATA_DIR + '/' + name) self.doneLoopSettingsPopup() def set_name(self, name): |