From 953ad5539b8f0dd44431c75c765c2d5eba81d73c Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 18 Dec 2008 20:41:32 +0000
Subject: use TMP_DIR for temporary files

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

diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index 157f15d..19e72ca 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -523,8 +523,8 @@ class SynthLabMain(gtk.EventBox):
             time.sleep(4)
             self.csnd.__del__()
             time.sleep(0.5)
-            command = "gst-launch-0.10 filesrc location=" + Config.INSTANCE_DIR + "/lab0 ! wavparse ! audioconvert ! vorbisenc ! oggmux ! filesink location=" + self.audioFileName
-            command2 = "rm " + Config.INSTANCE_DIR + "/lab0"
+            command = "gst-launch-0.10 filesrc location=" + Config.TMP_DIR + "/lab0 ! wavparse ! audioconvert ! vorbisenc ! oggmux ! filesink location=" + self.audioFileName
+            command2 = "rm " + Config.TMP_DIR + "/lab0"
             (status, output) = commands.getstatusoutput(command)
             (status2, output2) = commands.getstatusoutput(command2)
 
@@ -579,7 +579,7 @@ class SynthLabMain(gtk.EventBox):
         cpsPitch = 261.626*pow(1.0594633, midiPitch-36)
         self.recCount += 1
         if self.table == 85:
-            mess = "i5203." + str(self.recCount) + " 0 " + str(self.duration) + " " + str(cpsPitch) + " " + str(table) + " " + " ".join([str(n) for n in self.synthObjectsParameters.getOutputParameters()]) + ' "%s"' % Config.INSTANCE_DIR
+            mess = "i5203." + str(self.recCount) + " 0 " + str(self.duration) + " " + str(cpsPitch) + " " + str(table) + " " + " ".join([str(n) for n in self.synthObjectsParameters.getOutputParameters()]) + ' "%s"' % Config.TMP_DIR
         else:
             mess = "i5203." + str(self.recCount) + " 0 " + str(self.duration) + " " + str(cpsPitch) + " " + str(table) + " " + " ".join([str(n) for n in self.synthObjectsParameters.getOutputParameters()]) + ' "%s"' % Config.DATA_DIR
         self.csnd.inputMessage( mess )
@@ -1255,8 +1255,8 @@ class SynthLabMain(gtk.EventBox):
                     self.audioFileName += '.ogg'
             chooser.destroy()
 
-            if os.path.isfile(Config.INSTANCE_DIR + '/lab0'):
-                os.system('rm ' + Config.INSTANCE_DIR + '/lab0')
+            if os.path.isfile(Config.TMP_DIR + '/lab0'):
+                os.system('rm ' + Config.TMP_DIR + '/lab0')
             self.recordButton = widget
             self.recordWait = 1
             self.table = 85
diff --git a/TamTamSynthLab.activity/TamTamSynthLab.py b/TamTamSynthLab.activity/TamTamSynthLab.py
index 4f74c78..345d2dc 100644
--- a/TamTamSynthLab.activity/TamTamSynthLab.py
+++ b/TamTamSynthLab.activity/TamTamSynthLab.py
@@ -86,7 +86,7 @@ class TamTamSynthLab(activity.Activity):
             csnd = new_csound_client()
             csnd.connect(False)
         else:
-            logging.debug(1, 'TamTamSynthLab.onActivate connecting csound')
+            logging.debug('TamTamSynthLab.onActivate connecting csound')
             csnd = new_csound_client()
             csnd.connect(True)
 
--
cgit v0.9.1