Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.py2
-rw-r--r--Player/StandalonePlayer.py4
-rw-r--r--Resources/tooltips_en.py9
-rw-r--r--Resources/univorc.csd29
-rwxr-xr-xSynthLab/SynthLabConstants.py9
-rw-r--r--SynthLab/SynthLabParametersWindow.py2
-rw-r--r--SynthLab/SynthLabWindow.py17
7 files changed, 39 insertions, 33 deletions
diff --git a/Config.py b/Config.py
index d1d26e0..c35c59f 100644
--- a/Config.py
+++ b/Config.py
@@ -493,7 +493,7 @@ MAXIMUM_AMPLITUDE = 1
####################
## ToolTips
####################
-LANGUAGE = 'fr'
+LANGUAGE = 'en'
exec 'from Resources.tooltips_%s import Tooltips' % LANGUAGE
diff --git a/Player/StandalonePlayer.py b/Player/StandalonePlayer.py
index 3c24894..c03234e 100644
--- a/Player/StandalonePlayer.py
+++ b/Player/StandalonePlayer.py
@@ -51,8 +51,8 @@ class StandAlonePlayer( gtk.EventBox ):
loopEnd = Config.INSTRUMENTS[ inst ].loopEnd
crossDur = Config.INSTRUMENTS[ inst ].crossDur
loopPointsTable.extend( [ loopStart, loopEnd, crossDur ] )
- mess = "perf.InputMessage('f5755 0 512 -2 " + " " .join([str(n) for n in loopPointsTable]) + "')"
- self.csnd.sendText( mess )
+ mess = "f5755 0 512 -2 " + " " .join([str(n) for n in loopPointsTable])
+ self.csnd.inputMessage( mess )
self.synthLabWindow1 = SynthLabWindow(self.csnd, 86, self.closeSynthLab)
self.synthLabWindow2 = SynthLabWindow(self.csnd, 87, self.closeSynthLab)
diff --git a/Resources/tooltips_en.py b/Resources/tooltips_en.py
index d347314..46b23bc 100644
--- a/Resources/tooltips_en.py
+++ b/Resources/tooltips_en.py
@@ -93,6 +93,12 @@ class Tooltips:
VOWEL_TYPES = ['i', 'e', 'ee', 'a', 'u', 'o1', 'o2', 'oa', 'oe']
VIBRATO = VIBRATO
GAIN = GAIN
+
+ GRAIN = 'grain'
+ FREQ = FREQ
+ SAMPLEN = SAMPLEN
+ INDEX = 'index'
+ GAIN = GAIN
#Effects
DELAY = 'Delay'
@@ -133,7 +139,7 @@ class Tooltips:
MIX = 'Mix'
GAIN = GAIN
- SYNTHTYPES = [[LFO, RANDOM, ADSR], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON], [ADSR]]
+ SYNTHTYPES = [[LFO, RANDOM, ADSR], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON], [ADSR]]
SYNTHPARA = { 'lfo': [AMP, FREQ, WAVEFORM, OFFSET],
'rand': [MIN, MAX, FREQ, SEED],
'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE],
@@ -144,6 +150,7 @@ class Tooltips:
'noise': [NOISETYPE, FREQ, BANDWITH, GAIN],
'sample': [FREQ, SAMPLEN, LFILTER, GAIN],
'voice': [FREQ, VOWEL, VIBRATO, GAIN],
+ 'grain': [FREQ, SAMPLEN, INDEX, GAIN],
'wguide': [FREQ, LFILTER, FEEDBACK, GAIN],
'distort': [FREQ, RESON, DISTL, GAIN],
'filter': [FREQ, FSLOPE, FTYPE, GAIN],
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index b31c102..c54fad3 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -24,7 +24,6 @@ opcodes needed by TamTam's SynthLab
opcode synthGrain, a, aakiii
aindex, atrans, kfreq, iphase itable, itabdur xin
-
apha phasor kfreq, iphase
aenv tab apha, 42, 1
atrig = int(1-aenv)
@@ -311,24 +310,24 @@ elseif iSourceType == 7 then
a3 resonx ar, kform3, 220, 2 , 1
aSource = ((a1*80)+(a2*55)+(a3*40))*kpara4
elseif iSourceType == 8 then
-
- igrdur = .075
- kfreq = 1 / igrdur
+ iSndPitch = p4/261.626
+ igrdur = .1
itable = 5000+iPar2
- kamp = kpara4 * .2
- itabdur = nsamp(itable)
- aindex upsamp kpara3/8000 * itabdur
- atrans upsamp kpara1 * igrdur
irealTable = 5500 + iSourceNum
-
- as1 synthGrain aindex, atrans, kfreq, 0.82, iSourceNum, itabdur
- as2 synthGrain aindex, atrans, kfreq, .58, iSourceNum, itabdur
- as3 synthGrain aindex, atrans, kfreq, .41, iSourceNum, itabdur
- as4 synthGrain aindex, atrans, kfreq, 0.19, iSourceNum, itabdur
- as5 synthGrain aindex, atrans, kfreq, 0, iSourceNum, itabdur
+ itabdur = nsamp(itable)
+ kfreq = 1 / igrdur
+ kamp = kpara4 * .2
+ aindex upsamp kpara3 * itabdur
+ atrans upsamp kpara1 * igrdur * iSndPitch
+
+ as1 synthGrain aindex, atrans, kfreq, 0.82, irealTable, itabdur
+ as2 synthGrain aindex, atrans, kfreq, .58, irealTable, itabdur
+ as3 synthGrain aindex, atrans, kfreq, .41, irealTable, itabdur
+ as4 synthGrain aindex, atrans, kfreq, 0.19, irealTable, itabdur
+ as5 synthGrain aindex, atrans, kfreq, 0, irealTable, itabdur
aSource = (as1+as2+as3+as4+as5)*kamp
+ aSource butterlp aSource, 7500
-; aSource fog 1, 100, kpara1, aindex, 0, 0, .01, .02, .01, 10, 5501, 41, p3
endif
aSource dcblock aSource
diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py
index ad56d9d..09631a8 100755
--- a/SynthLab/SynthLabConstants.py
+++ b/SynthLab/SynthLabConstants.py
@@ -47,8 +47,9 @@ class SynthLabConstants:
'vco': [1, 1, .2, 1, 0, 2, 0, 2, 0, .5, FLOAT, INTEGER, FLOAT],
'pluck': [1, 5000, 0, 1, 0, 2, 100, 8000, 0, 8, FLOAT, INTEGER, FLOAT],
'noise': [0, 3000, 4000, 1, 0, 2, 0, 8000, 0, 6000, INTEGER, FLOAT, FLOAT],
- 'sample': [1, 5, 5000, 1, 0, 2, 0, 85, 100, 8000, FLOAT, INTEGER, FLOAT],
+ 'sample': [1, 5, 5000, 1, 0, 2, 0, 99, 100, 8000, FLOAT, INTEGER, FLOAT],
'voice': [1, 3, 5, 1, 0, 2, 0, 8, 1, 10, FLOAT, INTEGER, FLOAT],
+ 'grain': [1, 4, 1, 1, 0, 2, 0, 99, 0, 1, FLOAT, INTEGER, FLOAT],
'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 0, 1, FLOAT, FLOAT, FLOAT],
'distort': [800, .7, .7, 1, 0, 1000, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
'filter': [1000, .6, 0, 1, 200, 5000, 0, 1, 0, 2, FLOAT, FLOAT, INTEGER],
@@ -59,9 +60,9 @@ class SynthLabConstants:
CONTROL_TYPES = ['lfo', 'rand', 'adsr']
CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel']
CONTROL_TYPES_PLUS = ['lfo+', 'rand+', 'adsr+']
- SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice']
- SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel']
- SOURCE_TYPES_PLUS = ['fm+', 'buzz+', 'vco+', 'pluck+', 'noise+', 'sample+', 'voice+']
+ SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice', 'grain']
+ SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel', 'grainsel']
+ SOURCE_TYPES_PLUS = ['fm+', 'buzz+', 'vco+', 'pluck+', 'noise+', 'sample+', 'voice+', 'grain+']
FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon']
FX_TYPES_SEL = ['wguidesel', 'distortsel','filtersel', 'ringsel', 'reverbsel', 'harmonsel']
FX_TYPES_PLUS = ['wguide+', 'distort+','filter+', 'ring+', 'reverb+', 'harmon+']
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index 1e4f385..0b1382b 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -232,7 +232,7 @@ class SynthLabParametersWindow( gtk.Window ):
if num == 2:
if Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.VCO:
return Tooltips.VCO_WAVEFORMS[int(self.slider2Val)]
- elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.SAMPLE:
+ elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.SAMPLE or Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.GRAIN:
return self.sample_names[int(self.slider2Val)]
elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.VOICE:
return Tooltips.VOWEL_TYPES[int(self.slider2Val)]
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index c6734f4..e49ef51 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -790,20 +790,20 @@ class SynthLabWindow( gtk.Window ):
time.sleep(.01)
if lastTable[4] == 8:
snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[1])]
- mess = "perf.InputMessage('f5501 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
- self.csnd.sendText( mess )
+ mess = "f5501 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+ self.csnd.inputMessage( mess )
if lastTable[5] == 8:
snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[5])]
- mess = "perf.InputMessage('f5502 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
- self.csnd.sendText( mess )
+ mess = "f5502 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+ self.csnd.inputMessage( mess )
if lastTable[6] == 8:
snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[9])]
- mess = "perf.InputMessage('f5503 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
- self.csnd.sendText( mess )
+ mess = "f5503 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+ self.csnd.inputMessage( mess )
if lastTable[7] == 8:
snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[13])]
- mess = "perf.InputMessage('f5504 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
- self.csnd.sendText( mess )
+ mess = "f5504 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+ self.csnd.inputMessage( mess )
time.sleep(.01)
self.loadPixmaps(typesTable)
self.invalidate_rect( 0, 0, self.drawingAreaWidth, self.drawingAreaHeight )
@@ -851,7 +851,6 @@ class SynthLabWindow( gtk.Window ):
if i[0][0] < 4 and 7 < i[1][0] < 12:
offset = i[1][2]
self.contFxConnections.append([i[0][0], i[1][0], offset])
- print self.contFxConnections
table = [0 for i in range(16)]
fxs = [fx for fx in range(8,12) if fx in self.outputs]
for fx in fxs:
generated by cgit v0.9.1 at 2024-05-18 10:54:28 (GMT)