diff options
| author | Nat <natcl@hotmail.com> | 2007-10-10 20:01:44 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-10-10 20:01:44 (GMT) |
| commit | 7b14766b572db9745d6e7046382b08abb2cdc6dd (patch) | |
| tree | 3b24583ce5cbc23aeb519427f811781748be60a4 /TamTamEdit.activity | |
| parent | 200fc7f08e62957d38da1e39d84d100276445a1d (diff) | |
| parent | 10cd9c0bee24f19ff7c6585c610b2fa7b014ddb2 (diff) | |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamEdit.activity')
| -rw-r--r-- | TamTamEdit.activity/Edit/EditToolbars.py | 2 | ||||
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py index e8c9b10..95e3ab8 100644 --- a/TamTamEdit.activity/Edit/EditToolbars.py +++ b/TamTamEdit.activity/Edit/EditToolbars.py @@ -669,7 +669,7 @@ class generationPalette(Palette): return self.edit.setPageGenerateMode(mode) self.edit.generate(self.getGenerationParameters()) - # print self.rythmDensity, self.rythmRegularity,self.pitchRegularity,self.pitchStep, self.duration, self.silence,self.pattern + print self.rythmDensity, self.rythmRegularity,self.pitchRegularity,self.pitchStep, self.duration, self.silence,self.pattern self.popdown(True) ############ generate a preview melody ##############s diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index a91bdfc..6323833 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -404,7 +404,7 @@ class MainWindow( gtk.EventBox ): self.tuneInterface.selectPages( self.noteDB.getTune() ) - beats = random.randint(3,8) + beats = random.randint(3,6) stream = [] for page in self.noteDB.getTune(): stream += [ page, beats ] @@ -480,7 +480,7 @@ class MainWindow( gtk.EventBox ): Config.INSTRUMENTS[random.choice(drumsPickup)] ] def chooseGenParams(self): - choose = [random.randint(0,13) for x in range(4)] + choose = [random.randint(0,16) for x in range(4)] density = [GenerationConstants.RYTHM_DENSITY_BANK[i] for i in choose] rytReg = [GenerationConstants.RYTHM_REGU_BANK[i] for i in choose] step = [GenerationConstants.PITCH_STEP_BANK[i] for i in choose] |