cleanup paths for XO and non-XO installations

9 files changed, 42 insertions, 45 deletions

diff --git a/TamTamEdit.activity/Edit/Properties.py b/TamTamEdit.activity/Edit/Properties.py
index e72b22c..2dc6d84 100644
--- a/TamTamEdit.activity/Edit/Properties.py
+++ b/TamTamEdit.activity/Edit/Properties.py
@@ -60,7 +60,7 @@ class Properties( gtk.VBox ):
         self.pageBox.set_radius(10)
         beatBox = gtk.VBox()
         self.beatAdjust = gtk.Adjustment( 4, 2, 12, 1, 1, 0)
-        self.GUI['beatSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.beatAdjust, 7 )
+        self.GUI['beatSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.beatAdjust, 7 )
         self.GUI['beatSlider'].connect("button-release-event", self.handleBeat)
         self.GUI['beatSlider'].set_snap( 1 )
         self.GUI['beatSlider'].set_inverted(True)
@@ -129,7 +129,7 @@ class Properties( gtk.VBox ):
         panBox.set_border_width(3)
         panBox.set_radius(10)
         self.panAdjust = gtk.Adjustment( 0.5, 0, 1, .1, .1, 0)
-        self.GUI['panSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.panAdjust, 7 )
+        self.GUI['panSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.panAdjust, 7 )
         self.panAdjust.connect("value-changed", self.handlePan)
         self.GUI['panSlider'].set_snap( 0.1 )
         self.GUI['panSlider'].set_inverted(True)
@@ -147,7 +147,7 @@ class Properties( gtk.VBox ):
         reverbBox.set_border_width(3)
         reverbBox.set_radius(10)
         self.reverbAdjust = gtk.Adjustment(0.1, 0, 1, 0.1, 0.1, 0)
-        self.GUI['reverbSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.reverbAdjust, 7 )
+        self.GUI['reverbSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.reverbAdjust, 7 )
         self.reverbAdjust.connect("value-changed", self.handleReverb)
         self.GUI['reverbSlider'].set_snap( 0.1 )
         self.GUI['reverbSlider'].set_inverted(True)
@@ -165,7 +165,7 @@ class Properties( gtk.VBox ):
         attackBox.set_border_width(3)
         attackBox.set_radius(10)
         self.attackAdjust = gtk.Adjustment(0.04, 0.03, 1, .01, .01, 0)
-        self.GUI['attackSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.attackAdjust, 7 )
+        self.GUI['attackSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.attackAdjust, 7 )
         self.attackAdjust.connect("value-changed", self.handleAttack)
         self.GUI['attackSlider'].set_snap( 0.01 )
         self.GUI['attackSlider'].set_inverted(True)
@@ -183,7 +183,7 @@ class Properties( gtk.VBox ):
         decayBox.set_border_width(3)
         decayBox.set_radius(10)
         self.decayAdjust = gtk.Adjustment(0.31, 0.03, 1, .01, .01, 0)
-        self.GUI['decaySlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.decayAdjust, 7 )
+        self.GUI['decaySlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.decayAdjust, 7 )
         self.decayAdjust.connect("value-changed", self.handleDecay)
         self.GUI['decaySlider'].set_snap( 0.01 )
         self.GUI['decaySlider'].set_inverted(True)
@@ -217,7 +217,7 @@ class Properties( gtk.VBox ):
         self.filterSliderBox = gtk.VBox()
         self.filterSliderBox.set_size_request(50, -1)
         self.cutoffAdjust = gtk.Adjustment(1000, 100, 7000, 100, 100, 0)
-        self.GUI['cutoffSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.cutoffAdjust, 7 )
+        self.GUI['cutoffSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.cutoffAdjust, 7 )
         self.GUI['cutoffSlider'].set_snap(100)
         self.cutoffAdjust.connect("value-changed", self.handleFilter)
         self.GUI['cutoffSlider'].set_inverted(True)
@@ -273,7 +273,7 @@ class Properties( gtk.VBox ):
         #algoSlidersBox.set_radius(10)        
         minBox = gtk.VBox()
         self.minAdjust = gtk.Adjustment(0, 0, 100, 1, 1, 0)
-        self.GUI['minSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.minAdjust, 7 )
+        self.GUI['minSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.minAdjust, 7 )
         self.GUI['minSlider'].set_snap(1)
         self.minAdjust.connect("value-changed", self.handleMin)
         self.GUI['minSlider'].set_inverted(True)
@@ -283,7 +283,7 @@ class Properties( gtk.VBox ):
         
         maxBox = gtk.VBox()
         self.maxAdjust = gtk.Adjustment(100, 0, 100, 1, 1, 0)
-        self.GUI['maxSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.maxAdjust, 7 )
+        self.GUI['maxSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.maxAdjust, 7 )
         self.GUI['maxSlider'].set_snap(1)
         self.maxAdjust.connect("value-changed", self.handleMax)
         self.GUI['maxSlider'].set_inverted(True)
@@ -293,7 +293,7 @@ class Properties( gtk.VBox ):
         
         paraBox = gtk.VBox()
         self.paraAdjust = gtk.Adjustment(20, 0, 100, 1, 1, 0)
-        self.GUI['paraSlider'] = ImageVScale( Config.TAM_TAM_ROOT + "/Resources/Images/sliderEditVolume.png", self.paraAdjust, 7 )
+        self.GUI['paraSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.paraAdjust, 7 )
         self.GUI['paraSlider'].set_snap(1)
         self.paraAdjust.connect("value-changed", self.handlePara)
         self.GUI['paraSlider'].set_inverted(True)
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 16213b3..4a1d3fc 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -539,7 +539,7 @@ class LoopSettingsPalette( Palette ):
         ofile.write(dur + '\n')
         ofile.write(vol + '\n')
         ofile.write(self.sndname + '\n')
-        ofile.write(Config.LIB_DIR+"/Images/"+self.sndname+".png\n")
+        ofile.write(Config.IMAGE_ROOT+"/"+self.sndname+".png\n")
         ofile.write(category)
         ofile.close()
         if copy:
diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py
index 70d72c7..1661e45 100644
--- a/TamTamMini.activity/Mini/InstrumentPanel.py
+++ b/TamTamMini.activity/Mini/InstrumentPanel.py
@@ -128,6 +128,10 @@ class InstrumentPanel( gtk.EventBox ):
             keys = self.instrumentDB.instNamed.keys()
             for i in range(loadStage[2], len(keys)):
                 key = keys[i]
+
+                if Config.XO and key[0:3] == 'lab':
+                    continue
+
                 instrument = self.instrumentDB.instNamed[key]
                 if key[0:4] != 'drum' and key[0:4] != 'guid' and key[0:3] != 'mic' and key[0:3] != 'lab':
                     self.instrumentList["all"].append( key )
diff --git a/TamTamMini.activity/Mini/Loop.py b/TamTamMini.activity/Mini/Loop.py
index 27ac46c..348b465 100755
--- a/TamTamMini.activity/Mini/Loop.py
+++ b/TamTamMini.activity/Mini/Loop.py
@@ -206,7 +206,7 @@ class Loop:
                     loopList.append([rythmSequence[k], pitchSequence[k], gainSequence[k], durationSequence[k]])
 
 
-                f = open(Config.PREF_DIR + '/loops/loop' + names[beat] + '_' + str(counter) + '.ttl', 'w')
+                f = open(Config.INSTANCE_DIR + '/loops/loop' + names[beat] + '_' + str(counter) + '.ttl', 'w')
                 print "open file"
                 f.write('page_add 1 ' + str(beat) + ' 0 [1, 1, 1, 1, 1]\n')
                 print "write page_add"
diff --git a/TamTamMini.activity/Mini/miniToolbars.py b/TamTamMini.activity/Mini/miniToolbars.py
index 6401184..81a7317 100644
--- a/TamTamMini.activity/Mini/miniToolbars.py
+++ b/TamTamMini.activity/Mini/miniToolbars.py
@@ -327,7 +327,7 @@ class LoopSettingsPalette( Palette ):
         ofile.write(dur + '\n')
         ofile.write(vol + '\n')
         ofile.write(self.sndname + '\n')
-        ofile.write(Config.LIB_DIR+"/Images/"+self.sndname+".png\n")
+        ofile.write(Config.IMAGE_ROOT+"/"+self.sndname+".png\n")
         ofile.write(category)
         ofile.close()
         if copy:
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index 6e1b918..157f15d 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -1522,7 +1522,7 @@ class SynthLabMain(gtk.EventBox):
 
     def presetCallback( self, widget, data ):
         preset = 'synthFile' + str(data)
-        f = shelve.open( Config.TAM_TAM_ROOT + '/common/Resources/SynthFiles/' + preset, 'r')
+        f = shelve.open( Config.FILES_DIR + '/SynthFiles/' + preset, 'r')
         self.loadState(f)
         f.close()
         self.handleSaveTemp()
diff --git a/common/Config.py b/common/Config.py
index c620627..72ae993 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -5,7 +5,10 @@ from sugar import env
 
 #QUICKLOAD = os.path.isfile("QUICKLOAD") # skip loading inessential comenents to speed things up
 
-SugarMode = True
+if os.path.exists('/ofw'):
+    XO = True
+else:
+    XO = None
 
 if os.path.isfile("DEBUG"):
     f = open("DEBUG")
@@ -30,37 +33,31 @@ def logwrite(level, msg):
 TAM_TAM_ROOT = get_bundle_path()
 print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT
 
-EDIT_RESOURCES = os.path.join(TAM_TAM_ROOT, "../TamTamEdit.activity/common/Resources")
-FILES_DIR = TAM_TAM_ROOT + "/common/Resources"
-
 #PATHS
-if os.path.isdir("/usr/share/tamtam/Sounds"):
-    SOUNDS_DIR = "/usr/share/tamtam/Sounds"
-    LIB_DIR = "/usr/share/tamtam"
+if XO:
+    INSTANCE_DIR    = os.path.join(get_activity_root(), 'instance')
+    DATA_DIR        = os.path.join(get_activity_root(), 'data')
+    SNDS_INFO_DIR   = os.path.join(get_activity_root(), 'data', 'snds_info')
+    TMP_DIR         = os.path.join(get_activity_root(), 'tmp')
+    FILES_DIR       = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
+    SOUNDS_DIR      = os.path.join(FILES_DIR, "Sounds", "")
+    IMAGE_ROOT      = os.path.join(FILES_DIR, "Images", "")
 else:
-    SOUNDS_DIR = os.path.join(EDIT_RESOURCES, "Sounds")
-    LIB_DIR = EDIT_RESOURCES
-
-if SugarMode == True:
-    if not os.path.isdir(os.path.join(get_activity_root(), 'data', 'snds_info')):
-        os.system("mkdir " + os.path.join(get_activity_root(), 'data', 'snds_info'))
-    INSTANCE_DIR = os.path.join(get_activity_root(), 'instance')
-    DATA_DIR = os.path.join(get_activity_root(), 'data')
-    TMP_DIR = os.path.join(get_activity_root(), 'tmp')
+    INSTANCE_DIR    = os.path.join(os.getenv('HOME'), '.tamtam')
+    DATA_DIR        = os.path.join(os.getenv('HOME'), '.tamtam')
+    SNDS_INFO_DIR   = os.path.join(os.getenv('HOME'), '.tamtam', 'snds_info')
+    TMP_DIR         = os.path.join(get_activity_root(), 'tmp')
+    FILES_DIR       = "/usr/share/tamtam/"
+    SOUNDS_DIR      = "/usr/share/tamtam/Sounds/"
+    IMAGE_ROOT      = '/usr/share/tamtam/Images/'
 
-    SNDS_INFO_DIR = os.path.join(get_activity_root(), 'data', 'snds_info')
-
-else:
-    PREF_DIR = os.getenv('HOME') + '/.tamtam'
-    SYNTH_DIR= os.getenv('HOME') + '/.tamtam/synthlab'
-    SNDS_DIR= os.getenv('HOME') + '/.tamtam/snds'
-    SNDS_INFO_DIR = os.getenv('HOME') + '/.tamtam/snds_info'
-    SCRATCH_DIR = os.getenv('HOME') + '/tamtam/.scratch'
+for i in (INSTANCE_DIR, DATA_DIR, SNDS_INFO_DIR, TMP_DIR):
+    if not os.path.isdir(i): os.makedirs(i)
 
 #PLUGIN
 PLUGIN_DEBUG = "STDERR"
 PLUGIN_VERBOSE = DEBUG
-PLUGIN_UNIVORC = TAM_TAM_ROOT + "/common/Resources/tamtamorc.csd"
+PLUGIN_UNIVORC = os.path.join(FILES_DIR, "tamtamorc.csd")
 PLUGIN_KSMPS = 64
 PLUGIN_RATE  = 16000
 
@@ -99,10 +96,6 @@ CSOUND_STOP_RECORD_PERF = 'i5401 4 1 "%s"'
 #################
 
 LANGUAGE = 'En'
-if os.path.isdir("/usr/share/tamtam/Images"):
-    IMAGE_ROOT = '/usr/share/tamtam/Images/'
-else:
-    IMAGE_ROOT = os.path.join(EDIT_RESOURCES, "Images") + '/'
 MAIN_WINDOW_PADDING = 5
 
 BG_COLOR = '#404040'
diff --git a/common/Generation/GenerationParametersWindow.py b/common/Generation/GenerationParametersWindow.py
index bde409d..5a3ea31 100755
--- a/common/Generation/GenerationParametersWindow.py
+++ b/common/Generation/GenerationParametersWindow.py
@@ -172,11 +172,11 @@ class GenerationParametersWindow( gtk.VBox ):
         transButtonBox = RoundHBox(fillcolor=Config.INST_BCK_COLOR, bordercolor=Config.PANEL_BCK_COLOR)
         transButtonBox.set_radius(10)
 
-        self.GUI["saveButton"] = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/save.png', backgroundFill=Config.INST_BCK_COLOR )
+        self.GUI["saveButton"] = ImageButton(Config.IMAGE_ROOT + '/save.png', backgroundFill=Config.INST_BCK_COLOR )
         self.GUI["saveButton"].connect("clicked", self.handleSave, None)
         #transButtonBox.pack_start(self.GUI["saveButton"], False, False, 2)
 
-        self.GUI["loadButton"] = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/load.png', backgroundFill=Config.INST_BCK_COLOR )
+        self.GUI["loadButton"] = ImageButton(Config.IMAGE_ROOT + '/load.png', backgroundFill=Config.INST_BCK_COLOR )
         self.GUI["loadButton"].connect("clicked", self.handleLoad, None)
         #transButtonBox.pack_start(self.GUI["loadButton"], False, False, 2)
 
diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py
index ef22bce..8248d09 100644
--- a/common/Util/Instruments.py
+++ b/common/Util/Instruments.py
@@ -18,7 +18,7 @@ instrumentDB = InstrumentDB.getRef()
 
 
 def _addInstrument( name, csoundInstrumentId, instrumentRegister, category, loopStart, loopEnd, crossDur, ampScale = 1, kit = None ):
-    instrumentDB.addInstrumentFromArgs( name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.LIB_DIR+"/Images/"+name+".png", category )
+    instrumentDB.addInstrumentFromArgs( name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.IMAGE_ROOT+"/"+name+".png", category )
 
 
 _addInstrument( "mic1", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1 )