Added new internal presets, need to activate them.

Signed-off-by: Damien Zammit <damien@zamaudio.com>

8 files changed, 259 insertions, 88 deletions

diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
index 813e6dd..4504d99 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
@@ -22,7 +22,7 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZaMultiCompX2Plugin::ZaMultiCompX2Plugin()
-    : Plugin(paramCount, 1, 0) // 1 program, 0 state
+    : Plugin(paramCount, 2, 0)
 {
     // set default values
     d_setProgram(0);
@@ -265,10 +265,74 @@ void ZaMultiCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter)
 
 void ZaMultiCompX2Plugin::d_initProgramName(uint32_t index, d_string& programName)
 {
-    if (index != 0)
-        return;
+	switch(index) {
+	case 0:
+		programName = "Zero";
+		break;
+	case 1:
+		programName = "Presence";
+		break;
+	}
+}
 
-    programName = "Default";
+void ZaMultiCompX2Plugin::loadProgram(uint32_t index)
+{
+	switch(index) {
+	case 0:
+		attack = 10.0;
+		release = 80.0;
+		knee = 0.0;
+		ratio = 4.0;
+		thresdb[0] = -20.0;
+		thresdb[1] = -18.0;
+		thresdb[2] = -16.0;
+		makeup[0] = 0.0;
+		makeup[1] = 0.0;
+		makeup[2] = 0.0;
+		xover1 = 160.0;
+		xover2 = 1400.0;
+		gainr[0] = 0.0;
+		gainr[1] = 0.0;
+		gainr[2] = 0.0;
+		toggle[0] = 0.0;
+		toggle[1] = 0.0;
+		toggle[2] = 0.0;
+		listen[0] = 0.0;
+		listen[1] = 0.0;
+		listen[2] = 0.0;
+		stereodet = 1.0;
+		globalgain = 0.0;
+		outl = -45.0;
+		outr = -45.0;
+		break;
+	case 1:
+		attack = 10.0;
+		release = 200.0;
+		knee = 3.0;
+		ratio = 5.0;
+		thresdb[0] = -20.0;
+		thresdb[1] = -18.0;
+		thresdb[2] = -16.0;
+		makeup[0] = 9.0;
+		makeup[1] = 6.0;
+		makeup[2] = 6.0;
+		xover1 = 160.0;
+		xover2 = 1400.0;
+		gainr[0] = 0.0;
+		gainr[1] = 0.0;
+		gainr[2] = 0.0;
+		toggle[0] = 1.0;
+		toggle[1] = 1.0;
+		toggle[2] = 1.0;
+		listen[0] = 0.0;
+		listen[1] = 0.0;
+		listen[2] = 0.0;
+		stereodet = 1.0;
+		globalgain = 0.0;
+		outl = -45.0;
+		outr = -45.0;
+		break;
+	}
 }
 
 // -----------------------------------------------------------------------
@@ -454,41 +518,14 @@ void ZaMultiCompX2Plugin::d_setParameterValue(uint32_t index, float value)
 
 void ZaMultiCompX2Plugin::d_setProgram(uint32_t index)
 {
-    if (index != 0)
-        return;
-
     /* Default parameter values */
-    attack = 10.0f;
-    release = 80.0f;
-    knee = 0.0f;
-    ratio = 4.0f;
-    thresdb[0] = -20.0f;
-    thresdb[1] = -18.0f;
-    thresdb[2] = -16.0f;
-    makeup[0] = 0.0f;
-    makeup[1] = 0.0f;
-    makeup[2] = 0.0f;
-    gainr[0] = 0.0f;
-    gainr[1] = 0.0f;
-    gainr[2] = 0.0f;
-    xover1 = 160.0f;
-    xover2 = 1400.0f;
-    toggle[0] = 0.0f;
-    toggle[1] = 0.0f;
-    toggle[2] = 0.0f;
-    listen[0] = 0.0f;
-    listen[1] = 0.0f;
-    listen[2] = 0.0f;
-    globalgain = 0.0f;
-    stereodet = 1.0f;
-    outl = -45.f;
-    outr = -45.f;
+    loadProgram(index);
+
+    /* Default variable values */
     maxL = 0.f;
     maxR = 0.f;
     limit = 0.f;
 
-    /* Default variable values */
-
     /* reset filter values */
     d_activate();
 }
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp
index fa337a6..a7ee283 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp
@@ -120,9 +120,10 @@ protected:
 
     float d_getParameterValue(uint32_t index) const override;
     void  d_setParameterValue(uint32_t index, float value) override;
-    void  d_setProgram(uint32_t index) ;
+    void  d_setProgram(uint32_t index) override;
     void  d_setState(const char* key, const char* value) override;
 
+    void  loadProgram(uint32_t index);
     // -------------------------------------------------------------------
     // Process
 
@@ -176,7 +177,6 @@ private:
     float z2[2][MAX_FILT];
 };
 
-
 // -----------------------------------------------------------------------
 
 END_NAMESPACE_DISTRHO
diff --git a/plugins/ZamComp/ZamCompPlugin.cpp b/plugins/ZamComp/ZamCompPlugin.cpp
index 18baae3..20e1a31 100644
--- a/plugins/ZamComp/ZamCompPlugin.cpp
+++ b/plugins/ZamComp/ZamCompPlugin.cpp
@@ -22,7 +22,7 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamCompPlugin::ZamCompPlugin()
-    : Plugin(paramCount, 1, 0) // 1 program, 0 states
+    : Plugin(paramCount, 3, 0)
 {
     // set default values
     d_setProgram(0);
@@ -112,10 +112,53 @@ void ZamCompPlugin::d_initParameter(uint32_t index, Parameter& parameter)
 
 void ZamCompPlugin::d_initProgramName(uint32_t index, d_string& programName)
 {
-    if (index != 0)
-        return;
+	switch(index) {
+	case 0:
+		programName = "Zero";
+		break;
+	case 1:
+		programName = "PoppySnare";
+		break;
+	case 2:
+		programName = "VocalLeveller";
+		break;
+	}
+}
 
-    programName = "Default";
+void ZamCompPlugin::loadProgram(uint32_t index)
+{
+	switch(index) {
+	case 0:
+		attack = 10.0;
+		release = 80.0;
+		knee = 0.0;
+		ratio = 4.0;
+		thresdb = 0.0;
+		makeup = 0.0;
+		gainr = 0.0;
+		outlevel = -45.0;
+		break;
+	case 1:
+		attack = 10.0;
+		release = 50.0;
+		knee = 0.0;
+		ratio = 4.0;
+		thresdb = -20.0;
+		makeup = 9.0;
+		gainr = 0.0;
+		outlevel = -45.0;
+		break;
+	case 2:
+		attack = 50.0;
+		release = 400.0;
+		knee = 8.0;
+		ratio = 5.0;
+		thresdb = -25.0;
+		makeup = 9.0;
+		gainr = 0.0;
+		outlevel = -45.0;
+		break;
+	}
 }
 
 // -----------------------------------------------------------------------
@@ -187,16 +230,8 @@ void ZamCompPlugin::d_setParameterValue(uint32_t index, float value)
 
 void ZamCompPlugin::d_setProgram(uint32_t index)
 {
-    if (index != 0)
-        return;
-
     /* Default parameter values */
-    attack = 10.0f;
-    release = 80.0f;
-    knee = 0.0f;
-    ratio = 4.0f;
-    thresdb = 0.0f;
-    makeup = 0.0f;
+    loadProgram(index);
 
     /* reset filter values */
     d_activate();
diff --git a/plugins/ZamComp/ZamCompPlugin.hpp b/plugins/ZamComp/ZamCompPlugin.hpp
index e009c7e..9f22cb6 100644
--- a/plugins/ZamComp/ZamCompPlugin.hpp
+++ b/plugins/ZamComp/ZamCompPlugin.hpp
@@ -83,6 +83,7 @@ protected:
     float d_getParameterValue(uint32_t index) const override;
     void  d_setParameterValue(uint32_t index, float value) override;
     void  d_setProgram(uint32_t index) override;
+    void loadProgram(uint32_t index);
 
     // -------------------------------------------------------------------
     // Process
diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.cpp b/plugins/ZamCompX2/ZamCompX2Plugin.cpp
index 13d5fec..6d2e27e 100644
--- a/plugins/ZamCompX2/ZamCompX2Plugin.cpp
+++ b/plugins/ZamCompX2/ZamCompX2Plugin.cpp
@@ -22,7 +22,7 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamCompX2Plugin::ZamCompX2Plugin()
-    : Plugin(paramCount, 1, 0) // 1 program, 0 states
+    : Plugin(paramCount, 3, 0)
 {
     // set default values
     d_setProgram(0);
@@ -119,12 +119,59 @@ void ZamCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter)
     }
 }
 
+
 void ZamCompX2Plugin::d_initProgramName(uint32_t index, d_string& programName)
 {
-    if (index != 0)
-        return;
+	switch(index) {
+	case 0:
+		programName = "Zero";
+		break;
+	case 1:
+		programName = "PoppySnare";
+		break;
+	case 2:
+		programName = "VocalLeveller";
+		break;
+	}
+}
 
-    programName = "Default";
+void ZamCompX2Plugin::loadProgram(uint32_t index)
+{
+	switch(index) {
+	case 0:
+		attack = 10.0;
+		release = 80.0;
+		knee = 0.0;
+		ratio = 4.0;
+		thresdb = 0.0;
+		makeup = 0.0;
+		gainred = 0.0;
+		stereolink = 1.0;
+		outlevel = -45.0;
+		break;
+	case 1:
+		attack = 10.0;
+		release = 50.0;
+		knee = 0.0;
+		ratio = 4.0;
+		thresdb = -20.0;
+		makeup = 9.0;
+		gainred = 0.0;
+		stereolink = 1.0;
+		outlevel = -45.0;
+		break;
+	case 2:
+		attack = 50.0;
+		release = 400.0;
+		knee = 8.0;
+		ratio = 5.0;
+		thresdb = -25.0;
+		makeup = 9.0;
+		gainred = 0.0;
+		stereolink = 1.0;
+		outlevel = -45.0;
+		break;
+	}
 }
 
 // -----------------------------------------------------------------------
@@ -202,17 +249,8 @@ void ZamCompX2Plugin::d_setParameterValue(uint32_t index, float value)
 
 void ZamCompX2Plugin::d_setProgram(uint32_t index)
 {
-    if (index != 0)
-        return;
-
     /* Default parameter values */
-    attack = 10.0f;
-    release = 80.0f;
-    knee = 0.0f;
-    ratio = 4.0f;
-    thresdb = 0.0f;
-    makeup = 0.0f;
-    stereolink = 1.0f;
+    loadProgram(index);
 
     /* reset filter values */
     d_activate();
diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.hpp b/plugins/ZamCompX2/ZamCompX2Plugin.hpp
index deeffcf..82e8b6e 100644
--- a/plugins/ZamCompX2/ZamCompX2Plugin.hpp
+++ b/plugins/ZamCompX2/ZamCompX2Plugin.hpp
@@ -89,6 +89,8 @@ protected:
     void  d_setParameterValue(uint32_t index, float value) override;
     void  d_setProgram(uint32_t index) override;
 
+    void  loadProgram(uint32_t index);
+
     // -------------------------------------------------------------------
     // Process
 
diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.cpp b/plugins/ZamEQ2/ZamEQ2Plugin.cpp
index f150538..8fa0207 100644
--- a/plugins/ZamEQ2/ZamEQ2Plugin.cpp
+++ b/plugins/ZamEQ2/ZamEQ2Plugin.cpp
@@ -22,7 +22,7 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamEQ2Plugin::ZamEQ2Plugin()
-    : Plugin(paramCount, 1, 0) // 1 program, 0 states
+    : Plugin(paramCount, 4, 0)
 {
     // set default values
     d_setProgram(0);
@@ -148,10 +148,82 @@ void ZamEQ2Plugin::d_initParameter(uint32_t index, Parameter& parameter)
 
 void ZamEQ2Plugin::d_initProgramName(uint32_t index, d_string& programName)
 {
-    if (index != 0)
-        return;
+	switch(index) {
+	case 0:
+		programName = "Zero";
+		break;
+	case 1:
+		programName = "CarvedBass";
+		break;
+	case 2:
+		programName = "CarvedGuitar";
+		break;
+	case 3:
+		programName = "CarvedVox";
+		break;
+	}
+}
 
-    programName = "Default";
+void ZamEQ2Plugin::loadProgram(uint32_t index)
+{
+	switch(index) {
+	case 0:
+		gain1 = 0.0;
+		q1 = 1.0;
+		freq1 = 500.0;
+		gain2 = 0.0;
+		q2 = 1.0;
+		freq2 = 3000.0;
+		gainl = 0.0;
+		freql = 250.0;
+		gainh = 0.0;
+		freqh = 8000.0;
+		master = 0.0;
+		togglepeaks = 0.0;
+		break;
+	case 1:
+		gain1 = 0.0;
+		q1 = 1.0;
+		freq1 = 500.0;
+		gain2 = 0.0;
+		q2 = 1.0;
+		freq2 = 3000.0;
+		gainl = 6.0;
+		freql = 60.0;
+		gainh = 0.0;
+		freqh = 8000.0;
+		master = -6.0;
+		togglepeaks = 0.0;
+		break;
+	case 2:
+		gain1 = 5.6;
+		q1 = 1.46;
+		freq1 = 175.0;
+		gain2 = 0.7;
+		q2 = 1.33;
+		freq2 = 500.0;
+		gainl = -1.05;
+		freql = 30.0;
+		gainh = 0.0;
+		freqh = 8000.0;
+		master = -6.0;
+		togglepeaks = 0.0;
+		break;
+	case 3:
+		gain1 = 0.0;
+		q1 = 1.0;
+		freq1 = 500.0;
+		gain2 = 0.0;
+		q2 = 1.0;
+		freq2 = 3000.0;
+		gainl = 6.0;
+		freql = 6600.0;
+		gainh = 6.0;
+		freqh = 330.0;
+		master = -12.0;
+		togglepeaks = 0.0;
+		break;
+	}
 }
 
 // -----------------------------------------------------------------------
@@ -247,24 +319,8 @@ void ZamEQ2Plugin::d_setParameterValue(uint32_t index, float value)
 
 void ZamEQ2Plugin::d_setProgram(uint32_t index)
 {
-    if (index != 0)
-        return;
-
     /* Default parameter values */
-    gain1 = 0.0f;
-    q1 = 1.0f;
-    freq1 = 500.0f;
-    gain2 = 0.0f;
-    q2 = 1.0f;
-    freq2 = 3000.0f;
-    gainl = 0.0f;
-    freql = 250.0f;
-    gainh = 0.0f;
-    freqh = 8000.0f;
-    master = 0.f;
-    togglepeaks = 0.f;
-
-    /* Default variable values */
+    loadProgram(index);
 
     /* reset filter values */
     d_activate();
diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.hpp b/plugins/ZamEQ2/ZamEQ2Plugin.hpp
index 7c7b03d..2f67244 100644
--- a/plugins/ZamEQ2/ZamEQ2Plugin.hpp
+++ b/plugins/ZamEQ2/ZamEQ2Plugin.hpp
@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef ZAMCOMPPLUGIN_HPP_INCLUDED
-#define ZAMCOMPPLUGIN_HPP_INCLUDED
+#ifndef ZAMEQ2PLUGIN_HPP_INCLUDED
+#define ZAMEQ2PLUGIN_HPP_INCLUDED
 
 #include "DistrhoPlugin.hpp"
 
@@ -88,7 +88,9 @@ protected:
 
     float d_getParameterValue(uint32_t index) const override;
     void  d_setParameterValue(uint32_t index, float value) override;
-    void  d_setProgram(uint32_t index) ;
+    void  d_setProgram(uint32_t index) override;
+
+    void  loadProgram(uint32_t index);
 
     // -------------------------------------------------------------------
     // Process
@@ -135,4 +137,4 @@ private:
 
 END_NAMESPACE_DISTRHO
 
-#endif  // ZAMCOMP_HPP_INCLUDED
+#endif  // ZAMEQ2_HPP_INCLUDED