From d6ba40c9b568a99d1fb8e459cb9497cfffd3e981 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 18 Dec 2008 06:44:37 +0000
Subject: cleanup paths for XO and non-XO installations

---
(limited to 'TamTamMini.activity')

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:
--
cgit v0.9.1