moving instruments to 5000

1 files changed, 20 insertions, 42 deletions

diff --git a/TamTam.py b/TamTam.py
index cd26d0e..7790c0e 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -18,56 +18,36 @@ import time
 from GUI.StandalonePlayer import StandAlonePlayer
 
 if __name__ == "__main__": 
-    # TODO this should get started outside of TamTam (perhaps by Sugar?)
-    # start the CSoundServer
-    def do_quit(event, param):
-        CSoundClient.sendText('off()')
-        print 'do_quit()  waiting'
-        #we know that quitting doesn't really work
-        time.sleep(0.5)
-        os.kill(pid, signal.SIGKILL)
-        time.sleep(0.3)
-        os.wait()
-        print '... phew!'
-
-    try :
-        pid = os.fork()
-
-        if pid > 0 :
-            time.sleep(1)
-            CSoundClient.initialize()
-            CSoundClient.setMasterVolume(100)
-            tamtam = StandAlonePlayer()
-            #tamtam = gtk.Button("adsf")
-            mainwin = gtk.Window(gtk.WINDOW_TOPLEVEL)
-            mainwin.set_title('TamTam Player')
-            mainwin.set_resizable(False)
-            mainwin.connect('destroy', do_quit, pid)
-            mainwin.connect('destroy' , tamtam.destroy )
-            mainwin.connect( "key-press-event", tamtam.keyboardStandAlone.onKeyPress )
-            mainwin.connect( "key-release-event", tamtam.keyboardStandAlone.onKeyRelease )
-            mainwin.add(tamtam)
-            tamtam.show()
-            mainwin.show()
-            gtk.main()
-        else:
-            server = CsoundServerMult( ( CSoundConstants.SERVER_ADDRESS, CSoundConstants.SERVER_PORT ) )
-            server.interpret()
-
-    except OSError, e: 
-        print >>sys.stderr, "fork failed: %d (%s)" % (e.errno, e.strerror) 
-        sys.exit(1)
+    CSoundClient.initialize()
+    CSoundClient.setMasterVolume(100)
+    tamtam = StandAlonePlayer()
+    #tamtam = gtk.Button("adsf")
+    mainwin = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    mainwin.set_title('TamTam Player')
+    mainwin.set_resizable(False)
+    mainwin.connect('destroy' , gtk.main_quit )
+    mainwin.connect( "key-press-event", tamtam.keyboardStandAlone.onKeyPress )
+    mainwin.connect( "key-release-event", tamtam.keyboardStandAlone.onKeyRelease )
+    mainwin.add(tamtam)
+    tamtam.show()
+    mainwin.show()
+    gtk.main()
+
+    sys.exit(0)
 
 from sugar.activity.Activity import Activity
 class TamTam(Activity):
     def __init__(self):
+        def do_quit():
+            del self.tamtam
+
         Activity.__init__(self)
 
         CSoundClient.initialize()
         CSoundClient.setMasterVolume(100)
 
         self.tamtam = StandAlonePlayer()
-        self.connect('destroy', self.do_quit)
+        self.connect('destroy', do_quit)
         self.add(self.tamtam)
         self.tamtam.show()
         self.set_title('TamTam')
@@ -75,5 +55,3 @@ class TamTam(Activity):
         self.connect( "key-press-event", self.tamtam.keyboardStandAlone.onKeyPress )
         self.connect( "key-release-event", self.tamtam.keyboardStandAlone.onKeyRelease )
 
-    def do_quit(self):
-        del self.tamtam