Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Util/CSoundNote.py
diff options
context:
space:
mode:
authorOli <olpc@localhost.localdomain>2007-03-05 00:15:22 (GMT)
committer Oli <olpc@localhost.localdomain>2007-03-05 00:15:22 (GMT)
commit74d7de4b639a1f2fcf61473e6ff40f4d0a3b0f46 (patch)
tree2f493201d6f8edcfca25fa0c25ea6c931a39e4c6 /Util/CSoundNote.py
parent90fd4e1f17ea44f5886c8714cc085f69ea068695 (diff)
removed 'fullDuration' from CSoundNote
Diffstat (limited to 'Util/CSoundNote.py')
-rw-r--r--Util/CSoundNote.py52
1 files changed, 1 insertions, 51 deletions
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 )