network

2 files changed, 9 insertions, 5 deletions

diff --git a/Util/Network.py b/Util/Network.py
index 397110f..53a00e7 100644
--- a/Util/Network.py
+++ b/Util/Network.py
@@ -532,6 +532,7 @@ class Network:
                 con.waitingForData = self.unpacker.unpack_uint()
                 con.recvBuf = con.recvBuf[4:]
             else:
+                print "waiting for data"
                 return # wait for more data
 
         elif con.waitingForData:
@@ -540,8 +541,9 @@ class Network:
                 con.recvBuf = con.recvBuf[con.waitingForData:]
                 con.waitingForData = 0
                 for func in self.processMessage[con.message]:
-                    func( sock, con.message, data )
+                    gobject.idle_add( func, sock, con.message, data )
             else:
+                print "waiting for data"
                 return # wait for more data
 
         else:
@@ -549,7 +551,8 @@ class Network:
             if MSG_SIZE[con.message] == 0:
                 con.recvBuf = con.recvBuf[1:]
                 for func in self.processMessage[con.message]:
-                    func( sock, con.message, "" )
+                    gobject.idle_add( func, sock, con.message, "" )
+
             else:
                 con.waitingForData = MSG_SIZE[con.message]
                 con.recvBuf = con.recvBuf[1:]
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index cc40596..3e6c473 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -487,12 +487,12 @@ class miniTamTamMain(SubActivity):
         self.tempoSliderActive = False
         if self.network.isPeer() and self.delayedTempo != 0:
             if self.tempo != self.delayedTempo:
-                print "applying delayed tempo"
+                print "applying delayed tempo", self.delayedTempo
                 self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler )
                 print "a"
                 self.tempoAdjustment.set_value( self.delayedTempo )
                 print "b"
-                self._updateTempo( val )
+                self._updateTempo( self.delayedTempo )
                 self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler )
             self.delayedTempo = 0
             self.sendSyncQuery()
@@ -504,7 +504,7 @@ class miniTamTamMain(SubActivity):
         else: 
             self._updateTempo( int(adj.value), True )
 
-    def _updateTempo( self, val, propagate = False ):
+    def _updateTempo( self, val ):
 
         if self.network.isHost():
             t = time.time()
@@ -776,6 +776,7 @@ class miniTamTamMain(SubActivity):
         if self.tempoSliderActive:
             print "delaying update", val
             self.delayedTempo = val
+            return
         self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler )
         print "a"
         self.tempoAdjustment.set_value( val )