network

4 files changed, 8 insertions, 6 deletions

diff --git a/TamTamJam.activity/Jam/RythmGenerator.py b/TamTamJam.activity/Jam/RythmGenerator.py
index d1ea46e..70e734c 100644
--- a/TamTamJam.activity/Jam/RythmGenerator.py
+++ b/TamTamJam.activity/Jam/RythmGenerator.py
@@ -13,7 +13,7 @@ def generator( instrument, nbeats, density, regularity, reverbSend ):
     makeRythm = GenRythm()
 
     noteDuration = GenerationConstants.DOUBLE_TICK_DUR / 2
-    trackId = 5
+    trackId = 0
     pan = 0.5
     attack = 0.005
     decay = 0.095
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 8745e0a..4b2533e 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -145,7 +145,7 @@ class PlaybackToolbar( gtk.Toolbar ):
         self.stopButton.show()
         self.stopButton.set_tooltip(_('Stop Loops'))
 
-        self.muteButton = ToggleToolButton('media-playback-pause')
+        self.muteButton = ToggleToolButton('mute')
         self.muteButton.connect('clicked',self.handleMuteButton)
         self.insert(self.muteButton, -1)
         self.muteButton.show()
@@ -156,14 +156,14 @@ class PlaybackToolbar( gtk.Toolbar ):
         self.blockBeat = False
         self.beatWheel = []
 
-        btn = RadioToolButton( 'media-playback-pause', group = None )
+        btn = RadioToolButton( 'beats', group = None )
         btn.connect( 'toggled', self.setBeat, 0 )
         btn.set_tooltip( _('Jump To Beat') )
         self.insert( btn, -1 )
         self.beatWheel.append( btn )
 
         for i in range(1,12):
-            btn = RadioToolButton( 'media-playback-pause', group = self.beatWheel[0] )
+            btn = RadioToolButton( 'beats', group = self.beatWheel[0] )
             btn.connect( 'toggled', self.setBeat, i )
             btn.set_tooltip( _('Jump To Beat') )
             self.insert( btn, -1 )
diff --git a/TamTamJam.activity/TamTamJam.py b/TamTamJam.activity/TamTamJam.py
index 6169702..1bc18ec 100644
--- a/TamTamJam.activity/TamTamJam.py
+++ b/TamTamJam.activity/TamTamJam.py
@@ -20,7 +20,11 @@ from sugar.activity import activity
 
 class TamTamJam(activity.Activity):
     def __init__(self, handle):
+        # !!!!!! initialize threading in gtk !!!!!
+        # ! this is important for the networking !
+        # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         gtk.gdk.threads_init()
+
         activity.Activity.__init__(self, handle)
         self.ensure_dirs()
 
diff --git a/common/Util/Network.py b/common/Util/Network.py
index 65a15b0..79fbab5 100644
--- a/common/Util/Network.py
+++ b/common/Util/Network.py
@@ -539,7 +539,6 @@ class Network:
                 con.recvBuf = con.recvBuf[con.waitingForData:]
                 con.waitingForData = 0
                 for func in self.processMessage[con.message]:
-                    print "idle_add", func, con.message
                     gobject.idle_add( func, sock, con.message, data )
             else:
                 return # wait for more data
@@ -549,7 +548,6 @@ class Network:
             if MSG_SIZE[con.message] == 0:
                 con.recvBuf = con.recvBuf[1:]
                 for func in self.processMessage[con.message]:
-                    print "idle_add", func, con.message
                     gobject.idle_add( func, sock, con.message, "" )
             else:
                 con.waitingForData = MSG_SIZE[con.message]