diff options
| author | Nat <natcl@hotmail.com> | 2007-07-19 20:22:08 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-07-19 20:22:08 (GMT) |
| commit | 203bba3cf167efad03cb5b5327f7297ffdd345a6 (patch) | |
| tree | e0985266ebc469b7605585b11c1b9a883e4dbb11 /miniTamTam | |
| parent | cced1af0ae0aff4ffb830e013163864272cbc8d8 (diff) | |
| parent | b056ab55d194cd3fad1b10ce8545efca14642af3 (diff) | |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index c2ff30d..7640f32 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -351,11 +351,15 @@ class miniTamTamMain(SubActivity): def loopSettingsChannel(self, channel, value): self.csnd.setChannel(channel, value) - def loopSettingsPlayStop(self, state): + def loopSettingsPlayStop(self, state, loop): if not state: - self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE) + if loop: + self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE % 5022) + else: + self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE % 5023) else: - self.csnd.inputMessage(Config.CSOUND_STOP_LS_NOTE) + if loop: + self.csnd.inputMessage(Config.CSOUND_STOP_LS_NOTE) def doneLoopSettingsPopup(self): if self.loopSettingsBtn.get_active(): @@ -381,8 +385,12 @@ class miniTamTamMain(SubActivity): except IOError: print 'ERROR: failed to load Sound from file %s' % chooser.get_filename() chooser.destroy() - - self.loopSettings.set_name(soundName) + results = commands.getstatusoutput("csound -U sndinfo %s" % tempName) + if results[0] == 0: + list = results[1].split() + pos = list.index('seconds') + soundLength = float(list[pos-1]) + self.loopSettings.set_values(soundName, soundLength) self.loopSettingsPopup.show() self.loopSettingsPopup.move( 600, 200 ) self.timeoutLoad = gobject.timeout_add(1000, self.load_ls_instrument, soundName) |