diff options
| -rwxr-xr-x | GUI/SynthLab/SynthLabWindow.py | 5 | ||||
| -rw-r--r-- | Resources/univorc.csd | 4 | ||||
| -rwxr-xr-x | SynthLab/SynthObjectsParameters.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/GUI/SynthLab/SynthLabWindow.py b/GUI/SynthLab/SynthLabWindow.py index d0755f0..ab178cb 100755 --- a/GUI/SynthLab/SynthLabWindow.py +++ b/GUI/SynthLab/SynthLabWindow.py @@ -121,7 +121,7 @@ class SynthLabWindow( gtk.Window ): self.add(self.mainBox) self.writeTables( self.synthObjectsParameters.types, self.synthObjectsParameters.controlsParameters, self.synthObjectsParameters.sourcesParameters, self.synthObjectsParameters.fxsParameters ) -# self.presetCallback(self.presets,0) + self.presetCallback(self.presets,0) def onKeyPress(self,widget,event): midiPitch = KEY_MAP[event.hardware_keycode] @@ -168,7 +168,8 @@ class SynthLabWindow( gtk.Window ): def handleReset( self, widget, data ): self.locations = SynthLabConstants.INIT_LOCATIONS[:] - self.duration = 1 + self.duration = 1.5 + self.durAdjust.set_value(self.duration) self.connections = [] self.synthObjectsParameters.__init__() self.writeTables( self.synthObjectsParameters.types, self.synthObjectsParameters.controlsParameters, self.synthObjectsParameters.sourcesParameters, self.synthObjectsParameters.fxsParameters ) diff --git a/Resources/univorc.csd b/Resources/univorc.csd index 86b412f..cf90729 100644 --- a/Resources/univorc.csd +++ b/Resources/univorc.csd @@ -223,8 +223,9 @@ iPar4 table ioffset+3, 5201 if iSourceType == 1 then aSource foscil 2000*kpara4, ipitch, kpara1, kpara2, kpara3, 1 elseif iSourceType == 2 then -aSource gbuzz 5000*kpara4, ipitch*kpara1, int(abs(kpara2))+5, 0, kpara3, 2 +aSource gbuzz 5000*kpara4, ipitch*kpara1, int(abs(kpara2))+5, 0, kpara3+0.01, 2 elseif iSourceType == 3 then +iPar2 = int(iPar2) if iPar2 == 0 then imode = 0 elseif iPar2 == 1 then @@ -284,6 +285,7 @@ a3 resonx ar, kform3, 220, 2 , 1 aSource = ((a1*80)+(a2*55)+(a3*40))*kpara4 endif +aSource dcblock aSource xout aSource nosource: diff --git a/SynthLab/SynthObjectsParameters.py b/SynthLab/SynthObjectsParameters.py index e5efbcb..42ea6c3 100755 --- a/SynthLab/SynthObjectsParameters.py +++ b/SynthLab/SynthObjectsParameters.py @@ -2,7 +2,7 @@ class SynthObjectsParameters: def __init__( self ): self.types = [0,0,0,0,0,0,0,0,0,0,0,0] - self.controlsParameters = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] + self.controlsParameters = [.5,1,0,0,5,1,0,0,5,1,0,0,5,1,0,0] self.sourcesParameters = [1,.5,5,1,1,.5,5,1,1,.5,5,1,1,.5,5,1] self.fxsParameters = [100,3000,.8,1,100,3000,.8,1,100,3000,.8,1,100,3000,.8,1] self.outputParameters = [.01, .05, .9, .05] |