diff options
| author | amartin <olpc@xo-00-CE-12.localdomain> | 2007-06-19 03:00:48 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-00-CE-12.localdomain> | 2007-06-19 03:00:48 (GMT) |
| commit | d787b925f284c39b3b8888efa49671afa1eb5478 (patch) | |
| tree | 2651b5853ff641f7768976b1d12aaeddf1b0cb94 /miniTamTam | |
| parent | 1de7f260a5f0d71b126a90cfa2c87ad587a3cb12 (diff) | |
network
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 3c263d2..9d72e3f 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -38,7 +38,7 @@ class miniTamTamMain(SubActivity): SubActivity.__init__(self, set_mode) self.network = Util.Network.Network() - self.hearbeatStart = time.time() + self.heartbeatStart = time.time() self.network.registerHeartbeat( self.nextHeartbeat ) self.set_border_width(Config.MAIN_WINDOW_PADDING) @@ -52,6 +52,7 @@ class miniTamTamMain(SubActivity): self.beat = 4 self.reverb = 0. self.tempo = Config.PLAYER_TEMPO + self.beatDuration = 60.0/self.tempo self.rythmInstrument = 'drum1kit' self.muteInst = False self.drumFillin = Fillin( self.beat, self.tempo, self.rythmInstrument, self.reverb, self.drumVolume ) @@ -340,15 +341,17 @@ class miniTamTamMain(SubActivity): def handleTempoSliderRelease(self, widget, event): #self.tempo = int(widget.get_adjustment().value) #self.csnd.loopSetTempo(self.tempo) - self.sequencer.tempo = widget.get_adjustment().value - self.drumFillin.setTempo(self.tempo) + #self.sequencer.tempo = widget.get_adjustment().value + #self.drumFillin.setTempo(self.tempo) pass def handleTempoSliderChange(self,adj): self.tempo = int(adj.value) self.beatDuration = 60.0/self.tempo self.csnd.loopSetTempo(self.tempo) - + self.sequencer.tempo = widget.get_adjustment().value + self.drumFillin.setTempo(self.tempo) + img = int(self.scale( self.tempo, Config.PLAYER_TEMPO_LOWER,Config.PLAYER_TEMPO_UPPER, 1,8)) |