Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

Conflicts:

	Edit/MainWindow.py

1 files changed, 16 insertions, 19 deletions

diff --git a/TamTam.py b/TamTam.py
index 0d63393..3abf2bd 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -1,6 +1,4 @@
-import signal
-import time
-import sys
+import signal , time , sys , os, shutil
 import pygtk
 pygtk.require( '2.0' )
 import gtk
@@ -10,9 +8,13 @@ import Util.CSoundClient as CSoundClient
 from   Util.Profiler import TP
 from   Player.StandalonePlayer import StandAlonePlayer
 from   Edit.MainWindow import MainWindow
-
 from Util.Clooper.SClient import *
 
+try :
+    from sugar.activity.Activity import Activity
+except ImportError:
+    print "No Sugar for you"
+
 #csnd = CSoundClient.CSoundClientSocket( Config.SERVER_ADDRESS, Config.SERVER_PORT, os.getpid() )
 #csnd = CSoundClient.CSoundClientPerf( '/usr/share/olpc-csound-server/univorc.csd' )
 #csnd = CSoundClient.CSoundClientPerf( Config.TAM_TAM_ROOT + '/Resources/univorc.csd' )
@@ -22,8 +24,15 @@ csnd.connect(True)
 csnd.setMasterVolume(100.0)
 CSoundClient.CSoundClient = csnd   #Dodgy move: TODO: remove this global variable.
 
+if not os.path.isdir(Config.PREF_DIR):
+    os.mkdir(Config.PREF_DIR)
+    os.system('chmod 0777 ' + Config.PREF_DIR + ' &')
+    for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4']:
+        shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , Config.PREF_DIR + '/' + snd)
+        os.system('chmod 0777 ' + Config.PREF_DIR + '/' + snd + ' &')
+
 if __name__ == "__main__":     
-    def run_sugar_mode():
+    def run_non_sugar_mode():
         tamtam = StandAlonePlayer(csnd)
         mainwin = gtk.Window(gtk.WINDOW_TOPLEVEL)
         color = gtk.gdk.color_parse('#FFFFFF')
@@ -65,27 +74,16 @@ if __name__ == "__main__":
         else:
             run_edit_mode()
     else:
-        run_sugar_mode()
+        run_non_sugar_mode()
     
     csnd.connect(False)
     csnd.destroy()
     sys.exit(0)
 
-from sugar.activity.Activity import Activity
-from sugar import env
-import os, shutil
 class TamTam(Activity):
     def __init__(self):
         Activity.__init__(self)
         
-        home_path = env.get_profile_path() + Config.PREF_DIR
-        if not os.path.isdir(home_path):
-            os.mkdir(home_path)
-            os.system('chmod 0777 ' + home_path + ' &')
-            for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4']:
-                shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , home_path + '/' + snd)
-                os.system('chmod 0777 ' + home_path + '/' + snd + ' &')
-        
         color = gtk.gdk.color_parse('#FFFFFF')
         self.modify_bg(gtk.STATE_NORMAL, color)
         
@@ -109,8 +107,7 @@ class TamTam(Activity):
         csnd.connect(False)
 
     def do_quit(self, arg2):
-        home_path = env.get_profile_path() + Config.PREF_DIR
-        os.system('rm ' + home_path + '/synthTemp*')
+        os.system('rm ' + Config.PREF_DIR + '/synthTemp*')
         csnd.destroy(False)
         del self.tamtam