Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamJam.activity/Jam
diff options
context:
space:
mode:
authoramartin <olpc@xo-00-CE-12.localdomain>2007-11-02 21:56:40 (GMT)
committer amartin <olpc@xo-00-CE-12.localdomain>2007-11-02 21:56:40 (GMT)
commitb0839a170b241e6498b91c792535f3b5a0ee76b5 (patch)
treee4210c0fd1dcbb730da408baa86f9949e1046b87 /TamTamJam.activity/Jam
parentb7ef785eed4fa8f394c5d28bb5aa56b066c38e49 (diff)
network
Diffstat (limited to 'TamTamJam.activity/Jam')
-rw-r--r--TamTamJam.activity/Jam/JamMain.py8
-rw-r--r--TamTamJam.activity/Jam/Toolbars.py16
2 files changed, 12 insertions, 12 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index 05a67be..a837394 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -759,8 +759,8 @@ class JamMain(gtk.EventBox):
def getTempo( self ):
return self.tempo
- def setTempo( self, tempo ):
- self.jamToolbar.setTempo( tempo )
+ def setTempo( self, tempo, quiet = False ):
+ self.jamToolbar.setTempo( tempo, quiet )
def _setTempo( self, tempo, propagate = True ):
if self.network.isHost() or self.network.isOffline():
@@ -1086,7 +1086,6 @@ class JamMain(gtk.EventBox):
#-- Handlers ----------------------------------------------
def networkStatusWatcher( self, mode ):
- print "Network Watcher mode:", mode
if mode == Net.MD_OFFLINE:
if self.syncTimeout:
gobject.source_remove( self.syncTimeout )
@@ -1111,7 +1110,7 @@ class JamMain(gtk.EventBox):
def processHT_TEMPO_UPDATE( self, sock, message, data ):
self.unpacker.reset(data)
val = self.unpacker.unpack_int()
- self.setTempo( val )
+ self.setTempo( val, True )
self.sendSyncQuery()
def processPR_SYNC_QUERY( self, sock, message, data ):
@@ -1173,7 +1172,6 @@ class JamMain(gtk.EventBox):
return self.ticksPerSecond*(delta % self.beatDuration)
def updateSync( self ):
- print "udateSync"
if self.network.isOffline():
return False
elif self.network.isWaiting():
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 69a05eb..53de617 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -144,18 +144,23 @@ class JamToolbar( gtk.Toolbar ):
img = self.mapRange( widget.value, widget.lower, widget.upper, 0, 3 )
self.volumeImg.set_from_file(Config.TAM_TAM_ROOT + '/icons/volume' + str(img) + '.svg')
- def handleTempo( self, widget, propagate = True ):
+ def handleTempo( self, widget ):
if self.owner.network.isPeer():
self.owner.requestTempoChange(int(widget.get_value()))
else:
self._updateTempo( widget.get_value() )
- def setTempo( self, tempo ):
+ def setTempo( self, tempo, quiet = False ):
if self.tempoSliderActive:
self.delayedTempo = tempo
+ elif quiet:
+ self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler )
+ self.tempoAdjustment.set_value( self.delayedTempo )
+ self._updateTempo( tempo )
+ self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler )
else:
self.tempoAdjustment.set_value( tempo )
-
+
def _updateTempo( self, tempo ):
self.owner._setTempo( tempo )
@@ -169,10 +174,7 @@ class JamToolbar( gtk.Toolbar ):
self.tempoSliderActive = False
if self.owner.network.isPeer() and self.delayedTempo != 0:
if self.owner.getTempo() != self.delayedTempo:
- self.tempoAdjustment.handler_block( self.tempoAdjustmentHandler )
- self.tempoAdjustment.set_value( self.delayedTempo )
- self._updateTempo( self.delayedTempo )
- self.tempoAdjustment.handler_unblock( self.tempoAdjustmentHandler )
+ self.setTempo( self.delayedTempo, True )
self.delayedTempo = 0
self.owner.sendSyncQuery()