ADSR envelope on the output of SynthLab. Right click on the speaker for parameters

2 files changed, 14 insertions, 5 deletions

diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py
index ae48d74..b95abdb 100755
--- a/SynthLab/SynthLabConstants.py
+++ b/SynthLab/SynthLabConstants.py
@@ -35,8 +35,10 @@ class SynthLabConstants:
     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+']
-    CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES]
-    CHOOSE_TYPE2 = [CONTROL_TYPES_SEL, SOURCE_TYPES_SEL, FX_TYPES_SEL]
+    OUTPUT_TYPE = ['adsr']
+    OUTPUT_TYPE_SEL = ['adsrsel']
+    CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES, OUTPUT_TYPE]
+    CHOOSE_TYPE2 = [CONTROL_TYPES_SEL, SOURCE_TYPES_SEL, FX_TYPES_SEL, OUTPUT_TYPE_SEL]
     CHOOSE_TYPE_PLUS = [CONTROL_TYPES_PLUS, SOURCE_TYPES_PLUS, FX_TYPES_PLUS]
 
     PRESET = ['docu1', 'docu2', 'docu3', 'docu4', 'docu5', 'docu6', 'docu7', 'docu8', 'docu9', 'docu10']
diff --git a/SynthLab/SynthObjectsParameters.py b/SynthLab/SynthObjectsParameters.py
index cfb64b6..e5efbcb 100755
--- a/SynthLab/SynthObjectsParameters.py
+++ b/SynthLab/SynthObjectsParameters.py
@@ -5,10 +5,11 @@ class SynthObjectsParameters:
         self.controlsParameters = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
         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.choiceParamsSet = [self.controlsParameters, self.sourcesParameters, self.fxsParameters]
+        self.outputParameters = [.01, .05, .9, .05]
+        self.choiceParamsSet = [self.controlsParameters, self.sourcesParameters, self.fxsParameters, self.outputParameters]
 
     def update( self ):
-        self.choiceParamsSet = [self.controlsParameters, self.sourcesParameters, self.fxsParameters]
+        self.choiceParamsSet = [self.controlsParameters, self.sourcesParameters, self.fxsParameters, self.outputParameters]
 
     def getTypes( self ):
         return self.types
@@ -22,6 +23,9 @@ class SynthObjectsParameters:
     def getFxsParameters( self ):
         return self.fxsParameters
 
+    def getOutputParameters( self ):
+        return self.outputParameters
+
     def setType( self, pos, value ):
         self.types[pos] = value
     
@@ -32,4 +36,7 @@ class SynthObjectsParameters:
         self.sourcesParameters[pos] = value
 
     def setFxParameter( self, pos, value ):
-        self.fxsParameters[pos] = value              
+        self.fxsParameters[pos] = value   
+         
+    def setOutputParameter( self, pos, value ):
+        self.outputParameters[pos] = value