diff options
| -rw-r--r-- | Util/Network.py | 2 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Util/Network.py b/Util/Network.py index a3df280..d801bf1 100644 --- a/Util/Network.py +++ b/Util/Network.py @@ -48,7 +48,7 @@ message_enum = [ ("PR_LATENCY_QUERY", 4), # test latency ("PR_SYNC_QUERY", 4), # test sync ("PR_TEMPO_QUERY", 0), # test sync -("PR_TEMPO_CHANGE", 4), # test sync +("PR_REQUEST_TEMPO_CHANGE", 4), # test sync ("MAX_MSG_ID", 0) ] diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index b95b696..2e7037c 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -120,7 +120,7 @@ class miniTamTamMain(SubActivity): self.network.connectMessage( Net.HT_TEMPO_UPDATE, self.processHT_TEMPO_UPDATE ) self.network.connectMessage( Net.PR_SYNC_QUERY, self.processPR_SYNC_QUERY ) self.network.connectMessage( Net.PR_TEMPO_QUERY, self.processPR_TEMPO_QUERY ) - self.network.connectMessage( Net.PR_TEMPO_CHANGE, self.processPR_TEMPO_CHANGE ) + self.network.connectMessage( Net.PR_REQUEST_TEMPO_CHANGE, self.processPR_REQUEST_TEMPO_CHANGE ) # data packing classes self.packer = xdrlib.Packer() @@ -138,8 +138,10 @@ class miniTamTamMain(SubActivity): if os.path.isfile("FORCE_SHARE"): # HOST r = random.random() - print "::::: Sharing as TTDBG%f :::::" % r - self.activity.set_title(_gettext("TTDBG%f" % r)) + #print "::::: Sharing as TTDBG%f :::::" % r + #self.activity.set_title(_gettext("TTDBG%f" % r)) + print "::::: Sharing as TamTam :::::" + self.activity.set_title(_gettext("TamTam")) self.activity.connect( "shared", self.shared ) self.activity.share() elif self.activity._shared_activity: # PEER @@ -443,8 +445,7 @@ class miniTamTamMain(SubActivity): def handleTempoSliderChange(self,adj): print "handleTempoSliderChange" if self.network.isPeer(): - pass - #self.requestTempoChange(val) + self.requestTempoChange(int(adj.value)) else: self._updateTempo( int(adj.value), True ) @@ -681,7 +682,7 @@ class miniTamTamMain(SubActivity): def requestTempoChange( self, val ): self.packer.pack_int(val) - self.network.sendAll( Net.PR_TEMPO_CHANGE, self.packer.get_buffer() ) + self.network.send( Net.PR_REQUEST_TEMPO_CHANGE, self.packer.get_buffer() ) self.packer.reset() #-- Handlers ----------------------------------------------------------- @@ -711,11 +712,11 @@ class miniTamTamMain(SubActivity): def processHT_TEMPO_UPDATE( self, sock, message, data ): #print "got tempo update" self.unpacker.reset(data) - self.tempoAdjustment.signal_handler_block( self.tempoAdjustmentHandler ) + self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler ) val = self.unpacker.unpack_int() self.tempoAdjustment.set_value( val ) self._updateTempo( val ) - self.tempoAdjustment.signal_handler_unblock( self.tempoAdjustmentHandler ) + self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler ) self.sendSyncQuery() def processPR_SYNC_QUERY( self, sock, message, data ): @@ -728,7 +729,7 @@ class miniTamTamMain(SubActivity): self.network.send( Net.HT_TEMPO_UPDATE, self.packer.get_buffer(), to = sock ) self.packer.reset() - def processPR_TEMPO_CHANGE( self, sock, message, data ): + def processPR_REQUEST_TEMPO_CHANGE( self, sock, message, data ): print "got tempo change" self.unpacker.reset(data) val = self.unpacker.unpack_int() |