diff --git a/plugin/Makefile b/plugin/Makefile index 23edd19..5aa2bf2 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -12,10 +12,10 @@ NAME = peacock FILES_DSP = \ peacock.cpp \ controls.cpp \ - ic1.cpp \ + assigner.cpp \ oscillator.cpp \ filter.cpp \ - ic29.cpp + voiceboard.cpp include ../dpf/Makefile.plugins.mk diff --git a/plugin/ic1.cpp b/plugin/assigner.cpp similarity index 98% rename from plugin/ic1.cpp rename to plugin/assigner.cpp index ed6da43..87ba7c8 100644 --- a/plugin/ic1.cpp +++ b/plugin/assigner.cpp @@ -16,9 +16,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ic1.hpp" +#include "assigner.hpp" -#include "ic29.hpp" +#include "voiceboard.hpp" #include "peacock.hpp" Assigner ic1; diff --git a/plugin/ic1.hpp b/plugin/assigner.hpp similarity index 100% rename from plugin/ic1.hpp rename to plugin/assigner.hpp diff --git a/plugin/controls.cpp b/plugin/controls.cpp index e016aed..263ce51 100644 --- a/plugin/controls.cpp +++ b/plugin/controls.cpp @@ -16,7 +16,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ic29.hpp" +#include "assigner.hpp" #include "peacock.hpp" void Peacock::initParameter(uint32_t index, Parameter& parameter) { @@ -316,6 +316,7 @@ void Peacock::setParameterValue(uint32_t index, float value) { if (value < 0.0f) value = 0.0f; if (value > 127.0f) value = 127.0f; +#if 0 switch (index) { case p_lfoRate: ic29.patchRam.lfoRate = value; @@ -409,6 +410,8 @@ void Peacock::setParameterValue(uint32_t index, float value) { break; case p_vcoBend: ic29.vcoBend = (uint8_t)value; + break; } + #endif } diff --git a/plugin/filter.cpp b/plugin/filter.cpp index 8c1cb11..be18af8 100644 --- a/plugin/filter.cpp +++ b/plugin/filter.cpp @@ -16,7 +16,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ic29.hpp" +#include "voiceboard.hpp" void Voice::filter(float *buffer, uint32_t pos, uint32_t frames) { for (uint32_t i = 0; i < frames; i++) { diff --git a/plugin/ic29tables.hpp b/plugin/ic29tables.hpp index d287371..d7d27cb 100644 --- a/plugin/ic29tables.hpp +++ b/plugin/ic29tables.hpp @@ -18,8 +18,6 @@ #pragma once -#include "ic29.hpp" - const uint16_t Envelope::atkTable[128] = { 0x4000, 0x2000, 0x1000, 0x0aaa, 0x0800, 0x0666, 0x0555, 0x0492, 0x0400, 0x038e, 0x0333, 0x02e9, 0x02ab, 0x0276, 0x0249, 0x0222, 0x0200, 0x01e2, diff --git a/plugin/oscillator.cpp b/plugin/oscillator.cpp index 83929b2..31c2587 100644 --- a/plugin/oscillator.cpp +++ b/plugin/oscillator.cpp @@ -16,7 +16,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ic29.hpp" +#include "voiceboard.hpp" static inline float poly3blep0(float t) { float t2 = t * t; diff --git a/plugin/peacock.cpp b/plugin/peacock.cpp index adb776d..adc8aec 100644 --- a/plugin/peacock.cpp +++ b/plugin/peacock.cpp @@ -18,8 +18,8 @@ #include "peacock.hpp" -#include "ic1.hpp" -#include "ic29.hpp" +#include "assigner.hpp" +#include "voiceboard.hpp" START_NAMESPACE_DISTRHO diff --git a/plugin/ic29.cpp b/plugin/voiceboard.cpp similarity index 99% rename from plugin/ic29.cpp rename to plugin/voiceboard.cpp index 90bc470..c8ee426 100644 --- a/plugin/ic29.cpp +++ b/plugin/voiceboard.cpp @@ -16,7 +16,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ic29.hpp" +#include "voiceboard.hpp" #include "ic29tables.hpp" diff --git a/plugin/ic29.hpp b/plugin/voiceboard.hpp similarity index 100% rename from plugin/ic29.hpp rename to plugin/voiceboard.hpp