diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-07-09 21:21:42 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-09 21:21:42 (GMT) |
| commit | 08b67a187456a14fa7d9cd1733a666892a39f305 (patch) | |
| tree | 8f1f0308c7aded09c80a0170b51b8a328bc7b29d /Edit | |
| parent | daea2bfc72bf6cf41878a50020f07c3f492a8b33 (diff) | |
new icons, new sounds, new startup tunes...
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/MainWindow.py | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 29e1e86..1a4df81 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -71,14 +71,11 @@ class MainWindow( SubActivity ): windsPickup.append(name) elif Config.INSTRUMENTS[name].category == 'keyboard' or Config.INSTRUMENTS[name].category == 'people': keyboardPickup.append(name) - elif Config.INSTRUMENTS[name].category == 'concret' or Config.INSTRUMENTS[name].category == 'electronic': - if name[0:7] != 'guidice': - fxPickup.append(name) self.trackInstrumentDefault = [ Config.INSTRUMENTS[random.choice(stringsPickup)], + Config.INSTRUMENTS[random.choice(stringsPickup)], Config.INSTRUMENTS[random.choice(windsPickup)], Config.INSTRUMENTS[random.choice(keyboardPickup)], - Config.INSTRUMENTS[random.choice(fxPickup)], Config.INSTRUMENTS[random.choice(drumsPickup)] ] self.trackInstrument = self.trackInstrumentDefault[:] if len(self.trackInstrument) != Config.NUMBER_OF_TRACKS: raise 'error' @@ -553,7 +550,44 @@ class MainWindow( SubActivity ): self.displayPage( self.noteDB.getTune()[0] ) self.generateMode = 'page' self.generate( GenerationParameters() ) - + + stringsPickup = [] + windsPickup = [] + keyboardPickup = [] + fxPickup = [] + drumsPickup = ["drum1kit", "drum2kit", "drum3kit", "drum4kit", "drum5kit"] + for name in Config.INSTRUMENTS.keys(): + if Config.INSTRUMENTS[name].category == 'strings': + stringsPickup.append(name) + elif Config.INSTRUMENTS[name].category == 'winds': + windsPickup.append(name) + elif Config.INSTRUMENTS[name].category == 'keyboard' or Config.INSTRUMENTS[name].category == 'people': + keyboardPickup.append(name) + + self.trackInstrument = [ + Config.INSTRUMENTS[random.choice(stringsPickup)], + Config.INSTRUMENTS[random.choice(stringsPickup)], + Config.INSTRUMENTS[random.choice(windsPickup)], + Config.INSTRUMENTS[random.choice(keyboardPickup)], + Config.INSTRUMENTS[random.choice(drumsPickup)] ] + + instrumentsIds = [] + for inst in self.trackInstrument: + instrumentsIds.append(inst.instrumentId) + + self.pageAdd(instruments = instrumentsIds) + self.pageAdd(instruments = instrumentsIds) + self.pageAdd(instruments = instrumentsIds) + self.pageAdd(instruments = instrumentsIds) + + self.tuneInterface.selectPages( self.noteDB.getTune()[4:] ) + self.displayPage( self.noteDB.getTune()[4] ) + self.generateMode = 'page' + self.generate( GenerationParameters() ) + + self.tuneInterface.selectPages( self.noteDB.getTune() ) + self.displayPage( self.noteDB.getTune()[0] ) + self.audioRecordState = False def onActivate( self, arg ): |