diff options
| author | James <olpc@localhost.localdomain> | 2007-02-28 02:16:35 (GMT) |
|---|---|---|
| committer | James <olpc@localhost.localdomain> | 2007-02-28 02:16:35 (GMT) |
| commit | 63896fe4894554d4ed3f769c62755d88bee3f201 (patch) | |
| tree | 64e1ecb21848db3f23c1e959ea99c6fa70f2e2a4 /miniTamTam | |
| parent | 23b868606bb363d10499be3a09128c088f950421 (diff) | |
| parent | da65555ea722c1a71c6c64704aeeb29640f561f9 (diff) | |
merge
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/KeyboardStandAlone.py | 6 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py index 033edf2..ebaf6e2 100644 --- a/miniTamTam/KeyboardStandAlone.py +++ b/miniTamTam/KeyboardStandAlone.py @@ -20,7 +20,7 @@ class KeyboardStandAlone: self.getPlayState = getPlayState self.key_dict = dict() self.onset_dict = dict() - self.trackCount = 10 + self.trackCount = 0 self.instrument = 'flute' self.reverb = 0 @@ -38,8 +38,8 @@ class KeyboardStandAlone: # Assign on which track the note will be created according to the number of keys pressed track = self.trackCount self.trackCount += 1 - if self.trackCount >= 20: - self.trackCount = 10 + if self.trackCount >= 10: + self.trackCount = 0 # If the pressed key is in the keymap if KEY_MAP_PIANO.has_key(key): # CsoundNote parameters diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index fd47077..694d1eb 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -48,7 +48,9 @@ class miniTamTamMain(SubActivity): self.noteList = [] time.sleep(0.001) self.playbackTimeout = None - self.trackpad = Trackpad( self, self.csnd ) + self.trackpad = Trackpad( self ) + for i in range(21): + self.csnd.setTrackVolume( 100, i ) loopPointsTable = [] sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] @@ -206,7 +208,7 @@ class miniTamTamMain(SubActivity): self.seqRecordButton = ImageToggleButton(Config.IMAGE_ROOT + 'record2.png', Config.IMAGE_ROOT + 'record2sel.png') self.seqRecordButton.connect('clicked', self.rythmPlayer.handleRecordButton ) - self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'play.png', Config.IMAGE_ROOT + 'stop.png') + self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png') self.playStopButton.connect('clicked' , self.handlePlayButton) transportBox.pack_start(self.seqRecordButton) transportBox.pack_start(self.playStopButton) |