Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorNat <natcl@hotmail.com>2007-09-20 18:40:46 (GMT)
committer Nat <natcl@hotmail.com>2007-09-20 18:40:46 (GMT)
commit75f2efb800ae54d2dd0ee5ce009ea02eef84981f (patch)
treeb9b80effbae5f00cb57a0225d29e7d666e0f0250 /common
parent5d2514fa8e5985265e048ba8c454d9565a357f17 (diff)
path fixes
Diffstat (limited to 'common')
-rw-r--r--common/Config.py3
-rw-r--r--common/Util/LoopSettings.py4
2 files changed, 4 insertions, 3 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
diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py
index 977ee61..408b4d0 100644
--- a/common/Util/LoopSettings.py
+++ b/common/Util/LoopSettings.py
@@ -93,7 +93,7 @@ class LoopSettings( gtk.VBox ):
endBox = gtk.VBox()
self.endAdjust = gtk.Adjustment( 0.9, 0, 1, .001, .001, 0)
- self.GUI['endSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/common/Resources/Images/sliderEditVolume.png", self.endAdjust, 7 )
+ self.GUI['endSlider'] = ImageVScale( Config.IMAGE_ROOT + "sliderEditVolume.png", self.endAdjust, 7 )
self.endAdjust.connect("value-changed", self.handleEnd)
self.GUI['endSlider'].set_inverted(True)
self.GUI['endSlider'].set_size_request(50, 200)
@@ -106,7 +106,7 @@ class LoopSettings( gtk.VBox ):
durBox = gtk.VBox()
self.durAdjust = gtk.Adjustment( 0.01, 0, 0.2, .001, .001, 0)
- self.GUI['durSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/common/Resources/Images/sliderEditVolume.png", self.durAdjust, 7 )
+ self.GUI['durSlider'] = ImageVScale( Config.IMAGE_ROOT + "sliderEditVolume.png", self.durAdjust, 7 )
self.durAdjust.connect("value-changed", self.handleDur)
self.GUI['durSlider'].set_inverted(True)
self.GUI['durSlider'].set_size_request(50, 200)