diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-03-30 07:02:59 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-03-30 07:02:59 (GMT) |
| commit | aa782e44585f4d995ec709f47f01a748c4f8de9c (patch) | |
| tree | bd20b82acac773c79af9d445a05d5a26d37201ff /Generation | |
| parent | 3db12b5f0e4332a1a9f0c3acc0c6c0b849fc6a09 (diff) | |
clean-up of elctro and latin drums organization
Diffstat (limited to 'Generation')
| -rwxr-xr-x | Generation/Generator.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Generation/Generator.py b/Generation/Generator.py index 0b34c0d..09cc474 100755 --- a/Generation/Generator.py +++ b/Generation/Generator.py @@ -111,11 +111,7 @@ def generator1( if ( rand() * fillDrum ) > ( parameters.silence * .5 ): if fillDrum != 1: if rythmSequence[i] not in trackOnsets or pitchSequence[i] not in trackPitchs: - if rythmSequence[i] > ( barLength / 2 ): - fillOnset = rythmSequence[i] + random.choice([0, GenerationConstants.DOUBLE_TICK_DUR / 2.]) - else: - fillOnset = rythmSequence[i] - append( CSoundNote( fillOnset, pitchSequence[i], gainSequence[i], pan, durationSequence[i], trackId, instrument_id, 0.002, 0.098, 0.1, 0, 1000, False, 'edit' ) ) + append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i], pan, durationSequence[i], trackId, instrument_id, 0.002, 0.098, 0.1, 0, 1000, False, 'edit' ) ) else: append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i], pan, durationSequence[i], trackId, instrument_id, 0.002, 0.098, 0.1, 0, 1000, False, 'edit' ) ) else: @@ -160,7 +156,7 @@ def generator1( trackPitchs = [n.pitch for n in trackOfNotes] fillDrum = .5 rythmRegTemp = parameters.rythmRegularity - parameters.rythmRegularity = 0. + parameters.rythmRegularity = 0.5 for drumPitch in GenerationConstants.DRUM_COMPLEXITY4: pageGenerate( parameters, trackId, pageId, trackOfNotes, drumPitch ) parameters.rythmRegularity = rythmRegTemp |