Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xGeneration/Generator.py16
-rw-r--r--Util/CSoundClient.py2
-rw-r--r--Util/CSoundNote.py52
-rw-r--r--miniTamTam/KeyboardStandAlone.py2
-rw-r--r--miniTamTam/RythmGenerator.py9
-rw-r--r--miniTamTam/miniTamTamMain.py1
6 files changed, 8 insertions, 74 deletions
diff --git a/Generation/Generator.py b/Generation/Generator.py
index 3b42f35..794199b 100755
--- a/Generation/Generator.py
+++ b/Generation/Generator.py
@@ -71,15 +71,9 @@ def generator1(
def makeDurationSequence( onsetList, parameters, table_duration, barLength, currentInstrument ):
durationSequence = []
- fullDurationSequence = []
if len( onsetList ) > 1:
for i in range(len(onsetList) - 1):
duration = (onsetList[i+1] - onsetList[i]) * Utils.prob2( table_duration )
- if duration == (onsetList[i+1] - onsetList[i]):
- fullDurationSequence.append(True)
- else:
- fullDurationSequence.append(False)
-
if Config.INSTRUMENTS[ currentInstrument ].soundClass == 'drum':
duration = GenerationConstants.DOUBLE_TICK_DUR / 2
@@ -89,14 +83,12 @@ def generator1(
durationSequence.append( GenerationConstants.DOUBLE_TICK_DUR / 2)
else:
durationSequence.append(( barLength - onsetList[-1]) * Utils.prob2( table_duration ))
- fullDurationSequence.append(False)
elif len( onsetList ) == 1:
if Config.INSTRUMENTS[ currentInstrument ].soundClass == 'drum':
durationSequence.append( GenerationConstants.DOUBLE_TICK_DUR / 2 )
else:
durationSequence.append( ( barLength - onsetList[ 0 ] ) * Utils.prob2( table_duration ))
- fullDurationSequence.append( False )
- return durationSequence, fullDurationSequence
+ return durationSequence
def pageGenerate( parameters, trackId, pageId, selectedPageCount, lastPageId, trackOfNotes, drumPitch = None ):
trackNotes = trackOfNotes
@@ -127,13 +119,13 @@ def generator1(
elif parameters.pitchMethod == 1:
pitchSequence = makePitch.harmonicPitchSequence( rythmSequence, parameters, table_pitch, harmonicSequence )
gainSequence = makeGainSequence(rythmSequence)
- durationSequence, fullDurationSequence = makeDurationSequence(rythmSequence, parameters, table_duration, barLength, currentInstrument)
+ durationSequence = makeDurationSequence(rythmSequence, parameters, table_duration, barLength, currentInstrument)
for i in range(len(rythmSequence)):
if random.random() > parameters.silence:
trackNotes.append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i],
- GenerationConstants.DEFAULT_PAN, durationSequence[i], trackId,
- fullDurationSequence[i], Config.INSTRUMENTS[instrument[ trackId ]].instrumentId ) )
+ GenerationConstants.DEFAULT_PAN, durationSequence[i], trackId,
+ Config.INSTRUMENTS[instrument[ trackId ]].instrumentId ) )
# del trackDictionary[ trackId ][ pageId ]
trackDictionary[ trackId ][ pageId ] = trackNotes
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py
index 79ad8f3..2f2ed48 100644
--- a/Util/CSoundClient.py
+++ b/Util/CSoundClient.py
@@ -169,7 +169,6 @@ class _CSoundClientPlugin:
csnote.pan,
csnote.duration,
csnote.trackId,
- csnote.fullDuration,
csnote.attack,
csnote.decay,
csnote.reverbSend,
@@ -192,7 +191,6 @@ class _CSoundClientPlugin:
pan,
duration,
trackId,
- fullDuration = False,
attack = 0.002,
decay = 0.098,
reverbSend = 0.1,
diff --git a/Util/CSoundNote.py b/Util/CSoundNote.py
index f1c9d85..77e85d7 100644
--- a/Util/CSoundNote.py
+++ b/Util/CSoundNote.py
@@ -13,7 +13,6 @@ class CSoundNote :
pan,
duration,
trackId,
- fullDuration = False,
instrumentId = Config.INSTRUMENTS["flute"].instrumentId,
attack = 0.002,
decay = 0.098,
@@ -32,7 +31,6 @@ class CSoundNote :
self.instrumentId = instrumentId
#temp: catch old code trying to pass in instrument names here
int(instrumentId)
- self.fullDuration = fullDuration
self.attack = attack
self.decay = decay
self.reverbSend = reverbSend
@@ -52,7 +50,6 @@ class CSoundNote :
'duration': self.duration,
'trackId': self.trackId,
'instrumentId': self.instrumentId,
- 'fullDuration': self.fullDuration,
'attack': self.attack,
'decay': self.decay,
'reverbSend': self.reverbSend,
@@ -69,7 +66,6 @@ class CSoundNote :
self.duration = dict['duration']
self.trackId = dict['trackId']
self.instrumentId = dict['instrumentId']
- self.fullDuration = dict['fullDuration']
self.attack = dict['attack']
self.decay = dict['decay']
self.reverbSend = dict['reverbSend']
@@ -81,54 +77,8 @@ class CSoundNote :
def clone( self ):
return CSoundNote( self.onset, self.pitch, self.amplitude, self.pan,
- self.duration, self.trackId, self.fullDuration, self.instrumentId,
+ self.duration, self.trackId, self.instrumentId,
self.attack, self.decay, self.reverbSend, self.filterType, self.filterCutoff, self.tied, self.mode )
-# def getText( self, secs_per_tick, delay ):
-# if secs_per_tick > 1 : raise 'invalid secs_per_tick'
-# if Config.INSTRUMENTSID[self.instrumentId].kit != None:
-# instr = Config.INSTRUMENTSID[self.instrumentId].key[self.pitch]
-# newPitch = 1
-# else:
-# instr = self.INSTRUMENTSID[self.instrumentId]
-# newPitch = pow( GenerationConstants.TWO_ROOT_TWELVE, self.pitch - 36 )
-#
-# newDuration = secs_per_tick * self.duration
-#
-# # condition for tied notes
-# if instr.csoundInstrumentId == 101 and self.tied and self.fullDuration:
-# newDuration = -1
-# # condition for overlaped notes
-# if instr.csoundInstrumentId == 102 and self.overlap:
-# newDuration = oneTickDuration * self.duration + 1.
-#
-# if True: newAmplitude = self.amplitude * 0.8
-# else : newAmplitude = self.amplitude * music_volume_get( self.trackId )
-#
-# newAttack = newDuration * self.attack
-# if newAttack <= 0.002:
-# newAttack = 0.002
-#
-# newDecay = newDuration * self.decay
-# if newDecay <= 0.002:
-# newDecay = 0.002
-
-# return Config.PLAY_NOTE_COMMAND % ( \
-# instr.csoundInstrumentId,
-# self.trackId,
-# delay,
-# newDuration,
-# newPitch,
-# self.reverbSend,
-# newAmplitude,
- # self.pan,
-# Config.INSTRUMENT_TABLE_OFFSET+instr.instrumentId,
-# newAttack,
-# newDecay,
-# self.filterType,
-# self.filterCutoff,
-# instr.loopStart,
-# instr.loopEnd,
-# instr.crossDur )
diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py
index e418d69..124e412 100644
--- a/miniTamTam/KeyboardStandAlone.py
+++ b/miniTamTam/KeyboardStandAlone.py
@@ -69,7 +69,6 @@ class KeyboardStandAlone:
pan = 0.5,
duration = duration,
trackId = track,
- fullDuration = False,
instrumentId = Config.INSTRUMENTS[instrument].instrumentId,
reverbSend = self.reverb,
tied = True,
@@ -87,7 +86,6 @@ class KeyboardStandAlone:
duration = 100,
trackId = track,
decay = .1,
- fullDuration = False,
instrument = instrument,
instrumentFlag = instrument,
reverbSend = self.reverb))
diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py
index ed4c130..bbd9985 100644
--- a/miniTamTam/RythmGenerator.py
+++ b/miniTamTam/RythmGenerator.py
@@ -28,16 +28,13 @@ def generator( instrument, nbeats, regularity, reverbSend ):
def makeDurationSequence( onsetList ):
durationSequence = []
- fullDurationSequence = []
if len( onsetList ) > 1:
for i in range(len(onsetList)):
duration = GenerationConstants.DOUBLE_TICK_DUR / 2
durationSequence.append(duration)
- fullDurationSequence.append(False)
elif len( onsetList ) == 1:
durationSequence.append( GenerationConstants.DOUBLE_TICK_DUR / 2 )
- fullDurationSequence.append( False )
- return durationSequence, fullDurationSequence
+ return durationSequence
def pageGenerate( regularity, drumPitch ):
barLength = Config.TICKS_PER_BEAT * nbeats
@@ -50,7 +47,7 @@ def generator( instrument, nbeats, regularity, reverbSend ):
rythmSequence = makeRythm.drumRythmSequence(regularity)
pitchSequence = makePitchSequence(len(rythmSequence), drumPitch )
gainSequence = makeGainSequence(rythmSequence)
- durationSequence, fullDurationSequence = makeDurationSequence(rythmSequence)
+ durationSequence = makeDurationSequence(rythmSequence)
trackId = 5
pan = 0.5
@@ -60,7 +57,7 @@ def generator( instrument, nbeats, regularity, reverbSend ):
for i in range(len(rythmSequence)):
trackNotes.append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i],
pan, durationSequence[i], trackId,
- fullDurationSequence[i], Config.INSTRUMENTS[instrument].instrumentId, attack, decay, reverbSend ) )
+ Config.INSTRUMENTS[instrument].instrumentId, attack, decay, reverbSend ) )
return trackNotes
##################################################################################
# begin generate()
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 4dfb4f9..e12338c 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -365,7 +365,6 @@ class miniTamTamMain(SubActivity):
pan = 0.5,
duration = 20,
trackId = 1,
- fullDuration = False,
instrumentId = Config.INSTRUMENTS[instrument].instrumentId,
reverbSend = 0,
tied = False,
generated by cgit v0.9.1 at 2024-05-18 15:02:01 (GMT)