diff options
author | amartin <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) |
commit | b0839a170b241e6498b91c792535f3b5a0ee76b5 (patch) | |
tree | e4210c0fd1dcbb730da408baa86f9949e1046b87 /TamTamJam.activity/Jam/Toolbars.py | |
parent | b7ef785eed4fa8f394c5d28bb5aa56b066c38e49 (diff) |
network
Diffstat (limited to 'TamTamJam.activity/Jam/Toolbars.py')
-rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 16 |
1 files changed, 9 insertions, 7 deletions
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() |