summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2014-10-07 21:36:12 +1100
committerDamien Zammit <damien@zamaudio.com>2014-10-07 21:36:12 +1100
commit8dcb87ea8166691f40e4f64e11d9b54bfd441c4a (patch)
tree4e82710c0a150b339dd2d7b86c9d6ec7825027aa
parent01120ff69eed15c32c122e19b97a5287192c7594 (diff)
Parameter level tweaks in multibands
Signed-off-by: Damien Zammit <damien@zamaudio.com>
-rw-r--r--Makefile12
-rw-r--r--plugins/ZaMultiComp/ZaMultiCompPlugin.cpp4
-rw-r--r--plugins/ZaMultiComp/ZaMultiCompUI.cpp18
-rw-r--r--plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp14
-rw-r--r--plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp9
5 files changed, 32 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index b6c49e6..8799fc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
PREFIX ?= /usr/local
LIBDIR ?= lib
+BINDIR ?= bin
NAME = zam-plugins
VERSION = $(shell cat .version)
-PLUGINS=ZamComp ZamCompX2 ZaMultiComp ZaMultiCompX2 ZamTube ZamEQ2 ZamAutoSat ZamNoise ZamGEQ31
+PLUGINS=ZamComp ZamCompX2 ZaMultiComp ZaMultiCompX2 ZamTube ZamEQ2 ZamAutoSat ZamGEQ31
all: libs $(PLUGINS) gen
@@ -22,18 +23,23 @@ $(PLUGINS): libs
install: all
install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa \
- $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2 ; \
+ $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2 \
+ $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst ; \
for plugin in $(PLUGINS); do \
install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \
install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 \
bin/"$$plugin".lv2/* ; \
+ install -t $(DESTDIR)$(PREFIX)/$(BINDIR) bin/"$$plugin" ; \
done; \
install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa bin/*-ladspa.so
+ install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst bin/*-vst.so
uninstall:
for plugin in $(PLUGINS); do \
rm -rf $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \
- rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa/"$$plugin"-ladspa.so ;
+ rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa/"$$plugin"-ladspa.so ; \
+ rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst/"$$plugin"-vst.so ; \
+ rm -f $(DESTDIR)$(PREFIX)/$(BINDIR)/"$$plugin" ; \
done
diff --git a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp
index cf36218..862a04e 100644
--- a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp
+++ b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp
@@ -139,7 +139,7 @@ void ZaMultiCompPlugin::d_initParameter(uint32_t index, Parameter& parameter)
parameter.name = "Crossover freq 1";
parameter.symbol = "xover1";
parameter.unit = "Hz";
- parameter.ranges.def = 250.0f;
+ parameter.ranges.def = 160.0f;
parameter.ranges.min = 20.0f;
parameter.ranges.max = 1400.0f;
break;
@@ -409,7 +409,7 @@ void ZaMultiCompPlugin::d_setProgram(uint32_t index)
gainr[0] = 0.0f;
gainr[1] = 0.0f;
gainr[2] = 0.0f;
- xover1 = 250.0f;
+ xover1 = 160.0f;
xover2 = 1400.0f;
toggle[0] = 0.0f;
toggle[1] = 0.0f;
diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.cpp b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
index 65567b7..a34d072 100644
--- a/plugins/ZaMultiComp/ZaMultiCompUI.cpp
+++ b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
@@ -109,7 +109,7 @@ ZaMultiCompUI::ZaMultiCompUI()
fKnobXover1->setRange(20.0f, 1400.0f);
fKnobXover1->setStep(1.0f);
fKnobXover1->setUsingLogScale(true);
- fKnobXover1->setDefault(250.0f);
+ fKnobXover1->setDefault(160.0f);
fKnobXover1->setRotationAngle(240);
fKnobXover1->setCallback(this);
@@ -272,6 +272,7 @@ void ZaMultiCompUI::d_programChanged(uint32_t index)
return;
// Default values
+/*
fKnobAttack->setValue(10.0f);
fKnobRelease->setValue(80.0f);
fKnobThresh->setValue(0.0f);
@@ -281,14 +282,15 @@ void ZaMultiCompUI::d_programChanged(uint32_t index)
fKnobMakeup1->setValue(0.0f);
fKnobMakeup2->setValue(0.0f);
fKnobMakeup3->setValue(0.0f);
- fKnobXover1->setValue(250.0f);
+ fKnobXover1->setValue(160.0f);
fKnobXover2->setValue(1400.0f);
- fToggleBypass1->setValue(1.0f);
- fToggleBypass2->setValue(1.0f);
- fToggleBypass3->setValue(1.0f);
- fToggleListen1->setValue(1.0f);
- fToggleListen2->setValue(1.0f);
- fToggleListen3->setValue(1.0f);
+*/
+ fToggleBypass1->setValue(0.0f);
+ fToggleBypass2->setValue(0.0f);
+ fToggleBypass3->setValue(0.0f);
+ fToggleListen1->setValue(0.0f);
+ fToggleListen2->setValue(0.0f);
+ fToggleListen3->setValue(0.0f);
}
// -----------------------------------------------------------------------
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
index da7b4f5..4b61c17 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp
@@ -157,18 +157,18 @@ void ZaMultiCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter)
parameter.name = "Crossover freq 1";
parameter.symbol = "xover1";
parameter.unit = "Hz";
- parameter.ranges.def = 500.0f;
+ parameter.ranges.def = 160.0f;
parameter.ranges.min = 20.0f;
- parameter.ranges.max = 20000.0f;
+ parameter.ranges.max = 1400.0f;
break;
case paramXover2:
parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic;
parameter.name = "Crossover freq 2";
parameter.symbol = "xover2";
parameter.unit = "Hz";
- parameter.ranges.def = 3000.0f;
- parameter.ranges.min = 20.0f;
- parameter.ranges.max = 20000.0f;
+ parameter.ranges.def = 1400.0f;
+ parameter.ranges.min = 1400.0f;
+ parameter.ranges.max = 14000.0f;
break;
case paramToggle1:
parameter.hints = kParameterIsAutomable | kParameterIsBoolean;
@@ -471,8 +471,8 @@ void ZaMultiCompX2Plugin::d_setProgram(uint32_t index)
gainr[0] = 0.0f;
gainr[1] = 0.0f;
gainr[2] = 0.0f;
- xover1 = 500.0f;
- xover2 = 3000.0f;
+ xover1 = 160.0f;
+ xover2 = 1400.0f;
toggle[0] = 0.0f;
toggle[1] = 0.0f;
toggle[2] = 0.0f;
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
index 245556d..57fbee1 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
@@ -118,7 +118,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
fKnobXover1->setAbsolutePos(23, 175.5);
fKnobXover1->setRange(20.0f, 1400.0f);
fKnobXover1->setUsingLogScale(true);
- fKnobXover1->setDefault(250.0f);
+ fKnobXover1->setDefault(160.0f);
fKnobXover1->setStep(1.f);
fKnobXover1->setRotationAngle(240);
fKnobXover1->setCallback(this);
@@ -409,19 +409,18 @@ void ZaMultiCompX2UI::d_programChanged(uint32_t index)
return;
// Default values
+/*
fKnobAttack->setValue(10.0f);
fKnobRelease->setValue(80.0f);
-/*
- * fKnobThresh->setValue(-6.0f);
fKnobRatio->setValue(4.0f);
fKnobKnee->setValue(0.0f);
fKnobGlobalGain->setValue(0.0f);
fKnobMakeup1->setValue(0.0f);
fKnobMakeup2->setValue(0.0f);
fKnobMakeup3->setValue(0.0f);
- fKnobXover1->setValue(250.0f);
+ fKnobXover1->setValue(160.0f);
fKnobXover2->setValue(1400.0f);
- */
+*/
fToggleBypass1->setValue(0.0f);
fToggleBypass2->setValue(0.0f);
fToggleBypass3->setValue(0.0f);