diff options
| -rw-r--r-- | Util/Network.py | 9 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 17 |
2 files changed, 1 insertions, 25 deletions
diff --git a/Util/Network.py b/Util/Network.py index 53a00e7..0daac85 100644 --- a/Util/Network.py +++ b/Util/Network.py @@ -80,9 +80,7 @@ class Listener( threading.Thread ): def run(self): while 1: # rely on the owner to kill us when necessary try: - print "Listerner:: select" inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets ) - print "Listener:: inputready", inputReady if self.listenerSocket in inputReady: data, s = self.listenerSocket.recvfrom(MAX_SIZE) if data == "REFRESH": @@ -92,10 +90,8 @@ class Listener( threading.Thread ): continue else: break # exit thread - print "Listener:: threads_enter" gtk.gdk.threads_enter() self.owner._processSockets( inputReady, outputReady, exceptReady ) - print "Listener:: threads_leave" gtk.gdk.threads_leave() except socket.error, (value, message): print "Listener:: socket error: " + message @@ -521,7 +517,7 @@ class Network: def processStream( self, sock, newData = "" ): con = self.connection[sock] con.recvBuf += newData - + if con.waitingForData == -1: # message size in char con.waitingForData = ord(con.recvBuf[0]) con.recvBuf = con.recvBuf[1:] @@ -532,7 +528,6 @@ 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: @@ -543,7 +538,6 @@ class Network: for func in self.processMessage[con.message]: gobject.idle_add( func, sock, con.message, data ) else: - print "waiting for data" return # wait for more data else: @@ -552,7 +546,6 @@ class Network: con.recvBuf = con.recvBuf[1:] for func in self.processMessage[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 724d20e..8fc767b 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -486,18 +486,14 @@ class miniTamTamMain(SubActivity): self.tempoSliderActive = False if self.network.isPeer() and self.delayedTempo != 0: if self.tempo != self.delayedTempo: - print "applying delayed tempo", self.delayedTempo self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler ) - print "a" self.tempoAdjustment.set_value( self.delayedTempo ) - print "b" self._updateTempo( self.delayedTempo ) self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler ) self.delayedTempo = 0 self.sendSyncQuery() def handleTempoSliderChange(self,adj): - print "handleTempoSliderChange" if self.network.isPeer(): self.requestTempoChange(int(adj.value)) else: @@ -739,7 +735,6 @@ class miniTamTamMain(SubActivity): self.network.send( Net.PR_TEMPO_QUERY ) def requestTempoChange( self, val ): - print "requestTempoChange", val self.packer.pack_int(val) self.network.send( Net.PR_REQUEST_TEMPO_CHANGE, self.packer.get_buffer() ) self.packer.reset() @@ -769,21 +764,16 @@ class miniTamTamMain(SubActivity): self.syncQueryStart.pop(hash) def processHT_TEMPO_UPDATE( self, sock, message, data ): - print "got tempo update" self.unpacker.reset(data) val = self.unpacker.unpack_int() if self.tempoSliderActive: - print "delaying update", val self.delayedTempo = val return self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler ) - print "a" self.tempoAdjustment.set_value( val ) - print "b" self._updateTempo( val ) self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler ) self.sendSyncQuery() - print "done" def processPR_SYNC_QUERY( self, sock, message, data ): self.packer.pack_float(self.nextHeartbeat()) @@ -791,21 +781,16 @@ class miniTamTamMain(SubActivity): self.packer.reset() def processPR_TEMPO_QUERY( self, sock, message, data ): - print "processPR_TEMPO_QUERY" self.packer.pack_int(self.tempo) self.network.send( Net.HT_TEMPO_UPDATE, self.packer.get_buffer(), to = sock ) self.packer.reset() - print "done" def processPR_REQUEST_TEMPO_CHANGE( self, sock, message, data ): if self.tempoSliderActive: - print "got tempo change request, but ignoring" return self.unpacker.reset(data) val = self.unpacker.unpack_int() - print "got tempo change", val self.tempoAdjustment.set_value( val ) - print "done" #----------------------------------------------------------------------- # Sync @@ -828,8 +813,6 @@ class miniTamTamMain(SubActivity): return self.ticksPerSecond*(delta % self.beatDuration) def updateSync( self ): - #TEMP - return False if self.network.isOffline(): return False elif self.network.isWaiting(): |