diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:18:18 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:18:18 (GMT) |
| commit | 27ae244d089a93eb2d00631e5f4c17a54a5b41fd (patch) | |
| tree | 7c64f5ed4d2e77b90caf87993b24af103fedd519 /common/Config.py | |
| parent | 72610bcaf281600e9925d65db8f9af89b14e558e (diff) | |
| parent | 3f04e198e432714701cbdabf7ff244b29a960724 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Conflicts:
TamTamEdit.activity/Edit/MainWindow.py
Diffstat (limited to 'common/Config.py')
| -rw-r--r-- | common/Config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/Config.py b/common/Config.py index d3b2b03..62bd1f6 100644 --- a/common/Config.py +++ b/common/Config.py @@ -26,6 +26,7 @@ print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT #PATHS SOUNDS_DIR = "/usr/share/tamtam/Sounds" FILES_DIR = TAM_TAM_ROOT + "/common/Resources" +LIB_DIR = "/usr/share/tamtam" TUNE_DIR='/' SYNTH_DIR='/' if SugarMode == True: @@ -105,7 +106,7 @@ INSTRUMENTS = {} def _addInstrument( name, csoundInstrumentId, instrumentRegister, soundClass, category, loopStart, loopEnd, crossDur, kit = None ): if not QUICKLOAD or name[0:4] == "drum" or name in ["flute", "kalimba"]: # quick load INSTRUMENTS[name] = Instrument( name, _nextInstrumentId[0], csoundInstrumentId, instrumentRegister, soundClass, category, loopStart, loopEnd, crossDur, kit ) - instrumentDB.addInstrumentFromArgs( name, name, instrumentRegister, loopStart, loopEnd, crossDur, name, FILES_DIR+"/Images/"+name+".png", [ category ] ) + instrumentDB.addInstrumentFromArgs( name, name, instrumentRegister, loopStart, loopEnd, crossDur, name, LIB_DIR+"/Images/"+name+".png", [ category ] ) _nextInstrumentId[0] += 1 |