diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 06:35:39 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 06:35:39 (GMT) |
| commit | f6f0d2b4c9bada14c172d6318a2477063375aca7 (patch) | |
| tree | 6f4e3e1336bb4f2b149c50ce5f5b87d9aca8e3d3 /miniTamTam | |
| parent | c0d621dc23909c1e31745caace1dc8d7417f6a91 (diff) | |
work on sequence recording
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/KeyboardStandAlone.py | 2 | ||||
| -rw-r--r-- | miniTamTam/MiniSequencer.py | 13 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 2 | ||||
| -rw-r--r-- | miniTamTam/miniToolbars.py | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py index fcbca15..eb4ea7f 100644 --- a/miniTamTam/KeyboardStandAlone.py +++ b/miniTamTam/KeyboardStandAlone.py @@ -75,7 +75,7 @@ class KeyboardStandAlone: mode = 'mini') self.csnd.play(self.key_dict[key], 0.3) if self.getPlayState(): - recOnset = self.csnd.loopGetTick() + recOnset = int(self.csnd.loopGetTick()) self.onset_dict[key] = recOnset self.recording( CSoundNote( onset = recOnset, diff --git a/miniTamTam/MiniSequencer.py b/miniTamTam/MiniSequencer.py index 4182af9..7b1726e 100644 --- a/miniTamTam/MiniSequencer.py +++ b/miniTamTam/MiniSequencer.py @@ -35,7 +35,7 @@ class MiniSequencer: def handleRecordButton( self, widget, data ): if not self.startLooking: - if 1: #widget.get_active() == True: + if widget.get_active() == True: self.beats = [i*4 for i in range(self.beat)] self.upBeats = [i+2 for i in self.beats] self.realTick = [i for i in range(self.beat*4)] @@ -44,6 +44,11 @@ class MiniSequencer: self.startLooking = 1 self.startPlayback() + def handleOverButton( self, widget, data ): + if not self.startLooking: + self.startLooking = 1 + self.startPlayback() + def clearSequencer( self ): for n in self.notesList: self.csnd.loopDelete(n) @@ -71,7 +76,7 @@ class MiniSequencer: self.recordState = 1 self.startLooking = 0 self.recordButtonState(True) - self.startPoint = self.csnd.loopGetTick() + self.startPoint = int(self.csnd.loopGetTick()) if self.startPoint == 0: self.startPoint = self.beat * Config.TICKS_PER_BEAT - 1 if self.recordState: @@ -88,7 +93,7 @@ class MiniSequencer: def adjustDuration( self, pitch, onset ): if pitch in self.pitchs: - offset = self.csnd.loopGetTick() + offset = int(self.csnd.loopGetTick()) for note in self.sequencer: if note.pitch == pitch and note.onset == onset: if offset > note.onset: @@ -109,7 +114,7 @@ class MiniSequencer: self.csnd.loopUpdate(n, PARAMETER.AMPLITUDE, n.cs.amplitude*self.volume, 1) def handleClock( self ): - currentTick = self.csnd.loopGetTick() + currentTick = int(self.csnd.loopGetTick()) t = currentTick / 3 if self.tick != t: self.tick = t diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 7640f32..33a314c 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -436,7 +436,7 @@ class miniTamTamMain(SubActivity): self.synthLabWindow.show_all() def recordStateButton( self, state ): - self._recordToolbar.keyboardRecButton.set_active( state ) + self._recordToolbar.keyboardRecButton.set_active( state ) def synthLabWindowOpen(self): return self.synthLabWindow != None and self.synthLabWindow.get_property('visible') diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py index 6ef33be..9ff4df4 100644 --- a/miniTamTam/miniToolbars.py +++ b/miniTamTam/miniToolbars.py @@ -131,7 +131,7 @@ class recordToolbar(gtk.Toolbar): self.keyboardRecButton.set_tooltip(_('Click to record a loop')) self.keyboardRecOverButton = ToggleToolButton('overrec') - self.keyboardRecOverButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, False) + self.keyboardRecOverButton.connect('clicked', self.miniTamTam.sequencer.handleOverButton, False) self.insert(self.keyboardRecOverButton, -1) self.keyboardRecOverButton.show() self.keyboardRecOverButton.set_tooltip(_('Click to add a loop'))
\ No newline at end of file |