diff options
| author | falkTX <falktx@falktx.com> | 2022-12-06 13:19:37 +0000 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2022-12-06 13:19:37 +0000 |
| commit | 2e8157e70e1ee415b6a7d7a725f9296cb3cc5ef6 (patch) | |
| tree | 6e9018feacf05b313bb31a5b66c5da903f5dd43c | |
| parent | 59c2cd79ca30a6c891b0c353551b3a795d18a8e6 (diff) | |
Fix deprecated warnings
Signed-off-by: falkTX <falktx@falktx.com>
46 files changed, 333 insertions, 290 deletions
diff --git a/plugins/ZaMaximX2/ZaMaximX2Plugin.cpp b/plugins/ZaMaximX2/ZaMaximX2Plugin.cpp index 108de19..61c9217 100644 --- a/plugins/ZaMaximX2/ZaMaximX2Plugin.cpp +++ b/plugins/ZaMaximX2/ZaMaximX2Plugin.cpp @@ -36,7 +36,7 @@ void ZaMaximX2Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramRelease: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZaMaximX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramCeiling: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Output Ceiling"; parameter.symbol = "ceil"; parameter.unit = "dB"; @@ -54,7 +54,7 @@ void ZaMaximX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thresh"; parameter.unit = "dB"; diff --git a/plugins/ZaMaximX2/ZaMaximX2UI.cpp b/plugins/ZaMaximX2/ZaMaximX2UI.cpp index 75d7312..884fbec 100644 --- a/plugins/ZaMaximX2/ZaMaximX2UI.cpp +++ b/plugins/ZaMaximX2/ZaMaximX2UI.cpp @@ -30,7 +30,7 @@ ZaMaximX2UI::ZaMaximX2UI() setSize(ZaMaximX2Artwork::zamaximx2Width, ZaMaximX2Artwork::zamaximx2Height); // background - fImgBackground = Image(ZaMaximX2Artwork::zamaximx2Data, ZaMaximX2Artwork::zamaximx2Width, ZaMaximX2Artwork::zamaximx2Height, GL_BGR); + fImgBackground = Image(ZaMaximX2Artwork::zamaximx2Data, ZaMaximX2Artwork::zamaximx2Width, ZaMaximX2Artwork::zamaximx2Height, kImageFormatBGR); // led images fLedRedImg = Image(ZaMaximX2Artwork::ledredData, ZaMaximX2Artwork::ledredWidth, ZaMaximX2Artwork::ledredHeight); @@ -143,7 +143,8 @@ void ZaMaximX2UI::imageKnobValueChanged(ZamKnob* knob, float value) void ZaMaximX2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); // draw leds static const float sLedSpacing = 15.5f; @@ -181,8 +182,8 @@ void ZaMaximX2UI::onDisplay() numRedLeds = 1; else numRedLeds = 0; - for (int i=numRedLeds; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); + for (int i=numRedLeds; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); if (fLedYellowValue >= 20.f) numYellowLeds = 19; @@ -226,12 +227,12 @@ void ZaMaximX2UI::onDisplay() if (numYellowLeds > 12) { for (int i=12; i<numYellowLeds; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } else { for (int i=0; i<numYellowLeds; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } } diff --git a/plugins/ZaMultiComp/DistrhoPluginInfo.h b/plugins/ZaMultiComp/DistrhoPluginInfo.h index eea61ce..91bc2e0 100644 --- a/plugins/ZaMultiComp/DistrhoPluginInfo.h +++ b/plugins/ZaMultiComp/DistrhoPluginInfo.h @@ -27,11 +27,12 @@ #define DISTRHO_PLUGIN_NUM_INPUTS 1 #define DISTRHO_PLUGIN_NUM_OUTPUTS 1 -#define DISTRHO_PLUGIN_WANT_LATENCY 0 -#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 -#define DISTRHO_PLUGIN_WANT_STATE 1 -#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 -#define DISTRHO_PLUGIN_IS_RT_SAFE 1 +#define DISTRHO_PLUGIN_WANT_LATENCY 0 +#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 +#define DISTRHO_PLUGIN_WANT_STATE 1 +#define DISTRHO_PLUGIN_WANT_FULL_STATE 1 +#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 +#define DISTRHO_PLUGIN_IS_RT_SAFE 1 #define DISTRHO_PLUGIN_URI "urn:zamaudio:ZaMultiComp" #define DISTRHO_PLUGIN_CLAP_ID "com.zamaudio.ZaMultiComp" diff --git a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp index a9bea86..c8fdfd9 100644 --- a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp +++ b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp @@ -36,7 +36,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack1"; parameter.symbol = "att1"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramAttack2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack2"; parameter.symbol = "att2"; parameter.unit = "ms"; @@ -54,7 +54,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramAttack3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack3"; parameter.symbol = "att3"; parameter.unit = "ms"; @@ -63,7 +63,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramRelease1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release1"; parameter.symbol = "rel1"; parameter.unit = "ms"; @@ -72,7 +72,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release2"; parameter.symbol = "rel2"; parameter.unit = "ms"; @@ -81,7 +81,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release3"; parameter.symbol = "rel3"; parameter.unit = "ms"; @@ -90,7 +90,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramKnee1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee1"; parameter.symbol = "kn1"; parameter.unit = "dB"; @@ -99,7 +99,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramKnee2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee2"; parameter.symbol = "kn2"; parameter.unit = "dB"; @@ -108,7 +108,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramKnee3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee3"; parameter.symbol = "kn3"; parameter.unit = "dB"; @@ -117,7 +117,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramRatio1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio1"; parameter.symbol = "rat1"; parameter.unit = " "; @@ -126,7 +126,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramRatio2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio2"; parameter.symbol = "rat2"; parameter.unit = " "; @@ -135,7 +135,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramRatio3: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio3"; parameter.symbol = "rat3"; parameter.unit = " "; @@ -144,7 +144,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramThresh1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 1"; parameter.symbol = "thr1"; parameter.unit = "dB"; @@ -153,7 +153,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramThresh2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 2"; parameter.symbol = "thr2"; parameter.unit = "dB"; @@ -162,7 +162,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramThresh3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 3"; parameter.symbol = "thr3"; parameter.unit = "dB"; @@ -171,7 +171,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 1"; parameter.symbol = "mak1"; parameter.unit = "dB"; @@ -180,7 +180,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramMakeup2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 2"; parameter.symbol = "mak2"; parameter.unit = "dB"; @@ -189,7 +189,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramMakeup3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 3"; parameter.symbol = "mak3"; parameter.unit = "dB"; @@ -198,7 +198,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramGainR1: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 1"; parameter.symbol = "gr1"; parameter.unit = "dB"; @@ -207,7 +207,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramGainR2: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 2"; parameter.symbol = "gr2"; parameter.unit = "dB"; @@ -216,7 +216,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramGainR3: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 3"; parameter.symbol = "gr3"; parameter.unit = "dB"; @@ -225,7 +225,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramXover1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Crossover freq 1"; parameter.symbol = "xover1"; parameter.unit = "Hz"; @@ -234,7 +234,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1400.0f; break; case paramXover2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Crossover freq 2"; parameter.symbol = "xover2"; parameter.unit = "Hz"; @@ -243,7 +243,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramToggle1: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 1 ON"; parameter.symbol = "toggle1"; parameter.unit = " "; @@ -252,7 +252,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggle2: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 2 ON"; parameter.symbol = "toggle2"; parameter.unit = " "; @@ -261,7 +261,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggle3: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 3 ON"; parameter.symbol = "toggle3"; parameter.unit = " "; @@ -270,7 +270,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen1: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 1"; parameter.symbol = "listen1"; parameter.unit = " "; @@ -279,7 +279,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen2: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 2"; parameter.symbol = "listen2"; parameter.unit = " "; @@ -288,7 +288,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen3: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 3"; parameter.symbol = "listen3"; parameter.unit = " "; @@ -297,7 +297,7 @@ void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramGlobalGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Master Trim"; parameter.symbol = "globalgain"; parameter.unit = "dB"; diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.cpp b/plugins/ZaMultiComp/ZaMultiCompUI.cpp index 0963524..a846e7b 100644 --- a/plugins/ZaMultiComp/ZaMultiCompUI.cpp +++ b/plugins/ZaMultiComp/ZaMultiCompUI.cpp @@ -28,7 +28,7 @@ ZaMultiCompUI::ZaMultiCompUI() setSize(ZaMultiCompArtwork::zamulticompWidth, ZaMultiCompArtwork::zamulticompHeight); // background - fImgBackground = Image(ZaMultiCompArtwork::zamulticompData, ZaMultiCompArtwork::zamulticompWidth, ZaMultiCompArtwork::zamulticompHeight, GL_BGR); + fImgBackground = Image(ZaMultiCompArtwork::zamulticompData, ZaMultiCompArtwork::zamulticompWidth, ZaMultiCompArtwork::zamulticompHeight, kImageFormatBGR); // led images fLedRedImg = Image(ZaMultiCompArtwork::ledredData, ZaMultiCompArtwork::ledredWidth, ZaMultiCompArtwork::ledredHeight); @@ -822,7 +822,8 @@ void ZaMultiCompUI::imageSwitchClicked(ImageSwitch* toggle, bool down) void ZaMultiCompUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); setState("stateMeterReset", ""); @@ -918,14 +919,14 @@ void ZaMultiCompUI::onDisplay() numRedLeds3 = 1; else numRedLeds3 = 0; - for (int i=numRedLeds1; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed1StaticY); + for (int i=numRedLeds1; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed1StaticY); - for (int i=numRedLeds2; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed2StaticY); + for (int i=numRedLeds2; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed2StaticY); - for (int i=numRedLeds3; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed3StaticY); + for (int i=numRedLeds3; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed3StaticY); if (fLedYellowValueL >= 20.f) numYellowLedsL = 19; @@ -969,12 +970,12 @@ void ZaMultiCompUI::onDisplay() if (numYellowLedsL > 12) { for (int i=12; i<numYellowLedsL; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); } else { for (int i=0; i<numYellowLedsL; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); } /* diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp index 5227dcc..e1545c6 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp @@ -36,7 +36,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack1"; parameter.symbol = "att1"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramAttack2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack2"; parameter.symbol = "att2"; parameter.unit = "ms"; @@ -54,7 +54,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramAttack3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack3"; parameter.symbol = "att3"; parameter.unit = "ms"; @@ -63,7 +63,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramRelease1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release1"; parameter.symbol = "rel1"; parameter.unit = "ms"; @@ -72,7 +72,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release2"; parameter.symbol = "rel2"; parameter.unit = "ms"; @@ -81,7 +81,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release3"; parameter.symbol = "rel3"; parameter.unit = "ms"; @@ -90,7 +90,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramKnee1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee1"; parameter.symbol = "kn1"; parameter.unit = "dB"; @@ -99,7 +99,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramKnee2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee2"; parameter.symbol = "kn2"; parameter.unit = "dB"; @@ -108,7 +108,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramKnee3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee3"; parameter.symbol = "kn3"; parameter.unit = "dB"; @@ -117,7 +117,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramRatio1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio1"; parameter.symbol = "rat1"; parameter.unit = " "; @@ -126,7 +126,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramRatio2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio2"; parameter.symbol = "rat2"; parameter.unit = " "; @@ -135,7 +135,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramRatio3: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio3"; parameter.symbol = "rat3"; parameter.unit = " "; @@ -144,7 +144,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramThresh1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 1"; parameter.symbol = "thr1"; parameter.unit = "dB"; @@ -153,7 +153,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramThresh2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 2"; parameter.symbol = "thr2"; parameter.unit = "dB"; @@ -162,7 +162,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramThresh3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold 3"; parameter.symbol = "thr3"; parameter.unit = "dB"; @@ -171,7 +171,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 1"; parameter.symbol = "mak1"; parameter.unit = "dB"; @@ -180,7 +180,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramMakeup2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 2"; parameter.symbol = "mak2"; parameter.unit = "dB"; @@ -189,7 +189,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramMakeup3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup 3"; parameter.symbol = "mak3"; parameter.unit = "dB"; @@ -198,7 +198,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramGainR1: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 1"; parameter.symbol = "gr1"; parameter.unit = "dB"; @@ -207,7 +207,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramGainR2: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 2"; parameter.symbol = "gr2"; parameter.unit = "dB"; @@ -216,7 +216,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramGainR3: - parameter.hints = kParameterIsAutomable | kParameterIsOutput; + parameter.hints = kParameterIsAutomatable | kParameterIsOutput; parameter.name = "Gain Reduction 3"; parameter.symbol = "gr3"; parameter.unit = "dB"; @@ -225,7 +225,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramXover1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Crossover freq 1"; parameter.symbol = "xover1"; parameter.unit = "Hz"; @@ -234,7 +234,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1400.0f; break; case paramXover2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Crossover freq 2"; parameter.symbol = "xover2"; parameter.unit = "Hz"; @@ -243,7 +243,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramToggle1: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 1 ON"; parameter.symbol = "toggle1"; parameter.unit = " "; @@ -252,7 +252,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggle2: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 2 ON"; parameter.symbol = "toggle2"; parameter.unit = " "; @@ -261,7 +261,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggle3: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "ZamComp 3 ON"; parameter.symbol = "toggle3"; parameter.unit = " "; @@ -270,7 +270,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen1: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 1"; parameter.symbol = "listen1"; parameter.unit = " "; @@ -279,7 +279,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen2: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 2"; parameter.symbol = "listen2"; parameter.unit = " "; @@ -288,7 +288,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramListen3: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Listen 3"; parameter.symbol = "listen3"; parameter.unit = " "; @@ -297,7 +297,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramGlobalGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Master Trim"; parameter.symbol = "globalgain"; parameter.unit = "dB"; @@ -306,7 +306,7 @@ void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramStereoDet: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Detection (MAX/avg)"; parameter.symbol = "stereodet"; parameter.unit = " "; diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp index a263aa7..7ed4968 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp @@ -28,7 +28,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI() setSize(ZaMultiCompX2Artwork::zamulticompx2Width, ZaMultiCompX2Artwork::zamulticompx2Height); // background - fImgBackground = Image(ZaMultiCompX2Artwork::zamulticompx2Data, ZaMultiCompX2Artwork::zamulticompx2Width, ZaMultiCompX2Artwork::zamulticompx2Height, GL_BGR); + fImgBackground = Image(ZaMultiCompX2Artwork::zamulticompx2Data, ZaMultiCompX2Artwork::zamulticompx2Width, ZaMultiCompX2Artwork::zamulticompx2Height, kImageFormatBGR); // led images fLedRedImg = Image(ZaMultiCompX2Artwork::ledredData, ZaMultiCompX2Artwork::ledredWidth, ZaMultiCompX2Artwork::ledredHeight); @@ -837,7 +837,8 @@ void ZaMultiCompX2UI::imageSwitchClicked(ImageSwitch* toggle, bool down) void ZaMultiCompX2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); // draw leds static const float sLedSpacing = 15.3f; @@ -933,14 +934,14 @@ void ZaMultiCompX2UI::onDisplay() numRedLeds3 = 1; else numRedLeds3 = 0; - for (int i=numRedLeds1; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed1StaticY); + for (int i=numRedLeds1; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed1StaticY); - for (int i=numRedLeds2; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed2StaticY); + for (int i=numRedLeds2; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed2StaticY); - for (int i=numRedLeds3; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLed3StaticY); + for (int i=numRedLeds3; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLed3StaticY); if (fLedYellowValueL >= 20.f) numYellowLedsL = 19; @@ -984,12 +985,12 @@ void ZaMultiCompX2UI::onDisplay() if (numYellowLedsL > 12) { for (int i=12; i<numYellowLedsL; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); } else { for (int i=0; i<numYellowLedsL; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYL); } if (fLedYellowValueR >= 20.f) @@ -1034,12 +1035,12 @@ void ZaMultiCompX2UI::onDisplay() if (numYellowLedsR > 12) { for (int i=12; i<numYellowLedsR; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); } else { for (int i=0; i<numYellowLedsR; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticYR); } /* // TESTING - remove later diff --git a/plugins/ZamAutoSat/ZamAutoSatUI.cpp b/plugins/ZamAutoSat/ZamAutoSatUI.cpp index 6984941..51c40bc 100644 --- a/plugins/ZamAutoSat/ZamAutoSatUI.cpp +++ b/plugins/ZamAutoSat/ZamAutoSatUI.cpp @@ -27,7 +27,7 @@ ZamAutoSatUI::ZamAutoSatUI() setSize(ZamAutoSatArtwork::zamautosatWidth, ZamAutoSatArtwork::zamautosatHeight); // background - fImgBackground = Image(ZamAutoSatArtwork::zamautosatData, ZamAutoSatArtwork::zamautosatWidth, ZamAutoSatArtwork::zamautosatHeight, GL_BGR); + fImgBackground = Image(ZamAutoSatArtwork::zamautosatData, ZamAutoSatArtwork::zamautosatWidth, ZamAutoSatArtwork::zamautosatHeight, kImageFormatBGR); } @@ -46,7 +46,8 @@ void ZamAutoSatUI::parameterChanged(uint32_t, float) void ZamAutoSatUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamChild670/ZamChild670Plugin.cpp b/plugins/ZamChild670/ZamChild670Plugin.cpp index 2d7d7d7..2e67517 100644 --- a/plugins/ZamChild670/ZamChild670Plugin.cpp +++ b/plugins/ZamChild670/ZamChild670Plugin.cpp @@ -52,7 +52,7 @@ void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramInlevel: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Input level"; parameter.symbol = "inlevel"; parameter.unit = "dB"; @@ -61,7 +61,7 @@ void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramAC: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "AC Threshold"; parameter.symbol = "acthres"; parameter.unit = ""; @@ -70,7 +70,7 @@ void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramDC: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "DC Threshold"; parameter.symbol = "dcthres"; parameter.unit = ""; @@ -79,7 +79,7 @@ void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramTau: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Time constant select"; parameter.symbol = "tau"; parameter.unit = " "; @@ -88,7 +88,7 @@ void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 6.0f; break; case paramOutlevel: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Output level"; parameter.symbol = "outlevel"; parameter.unit = "dB"; diff --git a/plugins/ZamChild670/ZamChild670UI.cpp b/plugins/ZamChild670/ZamChild670UI.cpp index ac1da30..75654de 100644 --- a/plugins/ZamChild670/ZamChild670UI.cpp +++ b/plugins/ZamChild670/ZamChild670UI.cpp @@ -28,7 +28,7 @@ ZamChild670UI::ZamChild670UI() setSize(ZamChild670Artwork::zamchild670Width, ZamChild670Artwork::zamchild670Height); // background - fImgBackground = Image(ZamChild670Artwork::zamchild670Data, ZamChild670Artwork::zamchild670Width, ZamChild670Artwork::zamchild670Height, GL_BGR); + fImgBackground = Image(ZamChild670Artwork::zamchild670Data, ZamChild670Artwork::zamchild670Width, ZamChild670Artwork::zamchild670Height, kImageFormatBGR); // knob Image knobImage(ZamChild670Artwork::knobData, ZamChild670Artwork::knobWidth, ZamChild670Artwork::knobHeight); diff --git a/plugins/ZamComp/ZamCompPlugin.cpp b/plugins/ZamComp/ZamCompPlugin.cpp index 7c0651c..2502d86 100644 --- a/plugins/ZamComp/ZamCompPlugin.cpp +++ b/plugins/ZamComp/ZamCompPlugin.cpp @@ -36,7 +36,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack"; parameter.symbol = "att"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramRelease: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -54,7 +54,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramKnee: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee"; parameter.symbol = "kn"; parameter.unit = "dB"; @@ -63,7 +63,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramRatio: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio"; parameter.symbol = "rat"; parameter.unit = " "; @@ -72,7 +72,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thr"; parameter.unit = "dB"; @@ -81,7 +81,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup"; parameter.symbol = "mak"; parameter.unit = "dB"; @@ -90,7 +90,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramSlew: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Slew"; parameter.symbol = "slew"; parameter.unit = " "; @@ -99,7 +99,7 @@ void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 150.0f; break; case paramSidechain: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sidechain"; parameter.symbol = "sidech"; parameter.unit = " "; diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.cpp b/plugins/ZamCompX2/ZamCompX2Plugin.cpp index 87824ba..c9203bd 100644 --- a/plugins/ZamCompX2/ZamCompX2Plugin.cpp +++ b/plugins/ZamCompX2/ZamCompX2Plugin.cpp @@ -36,7 +36,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack"; parameter.symbol = "att"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramRelease: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -54,7 +54,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramKnee: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee"; parameter.symbol = "kn"; parameter.unit = "dB"; @@ -63,7 +63,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramRatio: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio"; parameter.symbol = "rat"; parameter.unit = " "; @@ -72,7 +72,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thr"; parameter.unit = "dB"; @@ -81,7 +81,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup"; parameter.symbol = "mak"; parameter.unit = "dB"; @@ -90,7 +90,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramSlew: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Slew"; parameter.symbol = "slew"; parameter.unit = " "; @@ -99,7 +99,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 150.0f; break; case paramSidechain: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sidechain"; parameter.symbol = "sidechain"; parameter.unit = " "; @@ -108,7 +108,7 @@ void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramStereo: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Stereo Detection"; parameter.symbol = "stereodet"; parameter.unit = " "; diff --git a/plugins/ZamCompX2/ZamCompX2UI.cpp b/plugins/ZamCompX2/ZamCompX2UI.cpp index c5b6797..d0b5f14 100644 --- a/plugins/ZamCompX2/ZamCompX2UI.cpp +++ b/plugins/ZamCompX2/ZamCompX2UI.cpp @@ -30,7 +30,7 @@ ZamCompX2UI::ZamCompX2UI() setSize(ZamCompX2Artwork::zamcompx2Width, ZamCompX2Artwork::zamcompx2Height); // background - fImgBackground = Image(ZamCompX2Artwork::zamcompx2Data, ZamCompX2Artwork::zamcompx2Width, ZamCompX2Artwork::zamcompx2Height, GL_BGR); + fImgBackground = Image(ZamCompX2Artwork::zamcompx2Data, ZamCompX2Artwork::zamcompx2Width, ZamCompX2Artwork::zamcompx2Height, kImageFormatBGR); // led images fLedRedImg = Image(ZamCompX2Artwork::ledredData, ZamCompX2Artwork::ledredWidth, ZamCompX2Artwork::ledredHeight); @@ -249,7 +249,8 @@ void ZamCompX2UI::imageSwitchClicked(ImageSwitch* tog, bool down) void ZamCompX2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); // draw leds static const float sLedSpacing = 15.5f; @@ -287,8 +288,8 @@ void ZamCompX2UI::onDisplay() numRedLeds = 1; else numRedLeds = 0; - for (int i=numRedLeds; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); + for (int i=numRedLeds; i>0; --i) + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); if (fLedYellowValue >= 20.f) numYellowLeds = 19; @@ -332,12 +333,12 @@ void ZamCompX2UI::onDisplay() if (numYellowLeds > 12) { for (int i=12; i<numYellowLeds; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } else { for (int i=0; i<numYellowLeds; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } } diff --git a/plugins/ZamDelay/ZamDelayPlugin.cpp b/plugins/ZamDelay/ZamDelayPlugin.cpp index 0c5df07..f3564e1 100644 --- a/plugins/ZamDelay/ZamDelayPlugin.cpp +++ b/plugins/ZamDelay/ZamDelayPlugin.cpp @@ -36,7 +36,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramInvert: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Invert"; parameter.symbol = "inv"; parameter.unit = " "; @@ -45,7 +45,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramDelaytime: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Time"; parameter.symbol = "time"; parameter.unit = "ms"; @@ -54,7 +54,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8000.0f; break; case paramSync: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sync BPM"; parameter.symbol = "sync"; parameter.unit = " "; @@ -63,7 +63,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramLPF: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "LPF"; parameter.symbol = "lpf"; parameter.unit = "Hz"; @@ -72,7 +72,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20000.0f; break; case paramDivisor: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Divisor"; parameter.symbol = "div"; parameter.unit = " "; @@ -81,7 +81,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 5.0f; break; case paramGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Output Gain"; parameter.symbol = "gain"; parameter.unit = "dB"; @@ -90,7 +90,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramDrywet: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Dry/Wet"; parameter.symbol = "drywet"; parameter.unit = " "; @@ -99,7 +99,7 @@ void ZamDelayPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramFeedback: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Feedback"; parameter.symbol = "feedb"; parameter.unit = " "; diff --git a/plugins/ZamDelay/ZamDelayUI.cpp b/plugins/ZamDelay/ZamDelayUI.cpp index 81d9c9d..0982a86 100644 --- a/plugins/ZamDelay/ZamDelayUI.cpp +++ b/plugins/ZamDelay/ZamDelayUI.cpp @@ -33,7 +33,7 @@ ZamDelayUI::ZamDelayUI() //font = fNanoText.findFont(NANOVG_DEJAVU_SANS_TTF); // background - fImgBackground = Image(ZamDelayArtwork::zamdelayData, ZamDelayArtwork::zamdelayWidth, ZamDelayArtwork::zamdelayHeight, GL_BGR); + fImgBackground = Image(ZamDelayArtwork::zamdelayData, ZamDelayArtwork::zamdelayWidth, ZamDelayArtwork::zamdelayHeight, kImageFormatBGR); // knob Image knobImage(ZamDelayArtwork::knobData, ZamDelayArtwork::knobWidth, ZamDelayArtwork::knobHeight); @@ -214,7 +214,8 @@ void ZamDelayUI::imageKnobValueChanged(ZamKnob* knob, float value) void ZamDelayUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.cpp b/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.cpp index da5262c..6427103 100644 --- a/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.cpp +++ b/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.cpp @@ -76,7 +76,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack"; parameter.symbol = "att"; parameter.unit = "ms"; @@ -85,7 +85,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramRelease: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -94,7 +94,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramKnee: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Knee"; parameter.symbol = "kn"; parameter.unit = "dB"; @@ -103,7 +103,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 8.0f; break; case paramRatio: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Ratio"; parameter.symbol = "rat"; parameter.unit = " "; @@ -112,7 +112,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 5.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thr"; parameter.unit = "dB"; @@ -121,7 +121,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMaxBoostCut: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Max Boost/Cut"; parameter.symbol = "max"; parameter.unit = "dB"; @@ -130,7 +130,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 10.0f; break; case paramSlew: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Slew"; parameter.symbol = "slew"; parameter.unit = " "; @@ -139,7 +139,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 150.0f; break; case paramSidechain: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sidechain"; parameter.symbol = "sidech"; parameter.unit = " "; @@ -148,7 +148,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggleLow: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Low Shelf"; parameter.symbol = "togglelow"; parameter.unit = " "; @@ -157,7 +157,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramTogglePeak: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Peak"; parameter.symbol = "togglepeak"; parameter.unit = " "; @@ -166,7 +166,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramToggleHigh: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "High Shelf"; parameter.symbol = "togglehigh"; parameter.unit = " "; @@ -175,7 +175,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramDetectFreq: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Detect Frequency"; parameter.symbol = "detectfreq"; parameter.unit = "Hz"; @@ -184,7 +184,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 16000.0f; break; case paramTargetFreq: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Target Frequency"; parameter.symbol = "targetfreq"; parameter.unit = "Hz"; @@ -193,7 +193,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 16000.0f; break; case paramTargetWidth: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Target width"; parameter.symbol = "targetwidth"; parameter.unit = "oct"; @@ -202,7 +202,7 @@ void ZamDynamicEQPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 5.0f; break; case paramBoostCut: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Boost / Cut"; parameter.symbol = "boostcut"; parameter.unit = " "; diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.cpp b/plugins/ZamEQ2/ZamEQ2Plugin.cpp index 41be8d9..04d1c68 100644 --- a/plugins/ZamEQ2/ZamEQ2Plugin.cpp +++ b/plugins/ZamEQ2/ZamEQ2Plugin.cpp @@ -36,7 +36,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramGain1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Boost/Cut 1"; parameter.symbol = "boost1"; parameter.unit = "dB"; @@ -45,7 +45,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramQ1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Bandwidth 1"; parameter.symbol = "bw1"; parameter.unit = " "; @@ -54,7 +54,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 6.0f; break; case paramFreq1: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Frequency 1"; parameter.symbol = "f1"; parameter.unit = "Hz"; @@ -63,7 +63,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramGain2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Boost/Cut 2"; parameter.symbol = "boost2"; parameter.unit = "dB"; @@ -72,7 +72,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramQ2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Bandwidth 2"; parameter.symbol = "bw2"; parameter.unit = " "; @@ -81,7 +81,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 6.0f; break; case paramFreq2: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Frequency 2"; parameter.symbol = "f2"; parameter.unit = "Hz"; @@ -90,7 +90,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramGainL: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Boost/Cut L"; parameter.symbol = "boostl"; parameter.unit = "dB"; @@ -99,7 +99,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramFreqL: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Frequency L"; parameter.symbol = "fl"; parameter.unit = "Hz"; @@ -108,7 +108,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramGainH: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Boost/Cut H"; parameter.symbol = "boosth"; parameter.unit = "dB"; @@ -117,7 +117,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramFreqH: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Frequency H"; parameter.symbol = "fh"; parameter.unit = "Hz"; @@ -126,7 +126,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 14000.0f; break; case paramMaster: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Master Gain"; parameter.symbol = "master"; parameter.unit = "dB"; @@ -135,7 +135,7 @@ void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramTogglePeaks: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Peaks ON"; parameter.symbol = "peaks"; parameter.unit = " "; diff --git a/plugins/ZamEQ2/ZamEQ2UI.cpp b/plugins/ZamEQ2/ZamEQ2UI.cpp index 0746629..1b0620c 100644 --- a/plugins/ZamEQ2/ZamEQ2UI.cpp +++ b/plugins/ZamEQ2/ZamEQ2UI.cpp @@ -29,7 +29,7 @@ ZamEQ2UI::ZamEQ2UI() setSize(ZamEQ2Artwork::zameq2Width, ZamEQ2Artwork::zameq2Height); // background - fImgBackground = Image(ZamEQ2Artwork::zameq2Data, ZamEQ2Artwork::zameq2Width, ZamEQ2Artwork::zameq2Height, GL_BGR); + fImgBackground = Image(ZamEQ2Artwork::zameq2Data, ZamEQ2Artwork::zameq2Width, ZamEQ2Artwork::zameq2Height, kImageFormatBGR); // toggle image Image sliderImage(ZamEQ2Artwork::togglesliderData, ZamEQ2Artwork::togglesliderWidth, ZamEQ2Artwork::togglesliderHeight); @@ -494,7 +494,8 @@ void ZamEQ2UI::calceqcurve(float x[], float y[]) void ZamEQ2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); calceqcurve(eqx, eqy); diff --git a/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp b/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp index 1ecbea1..a64e926 100644 --- a/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp +++ b/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp @@ -36,7 +36,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramMaster: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Master Gain"; parameter.symbol = "master"; parameter.unit = "dB"; @@ -45,7 +45,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.f; break; case paramGain1: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "32Hz"; parameter.symbol = "band1"; parameter.unit = "dB"; @@ -54,7 +54,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain2: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "40Hz"; parameter.symbol = "band2"; parameter.unit = "dB"; @@ -63,7 +63,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain3: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "50Hz"; parameter.symbol = "band3"; parameter.unit = "dB"; @@ -72,7 +72,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain4: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "63Hz"; parameter.symbol = "band4"; parameter.unit = "dB"; @@ -81,7 +81,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain5: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "79Hz"; parameter.symbol = "band5"; parameter.unit = "dB"; @@ -90,7 +90,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain6: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "100Hz"; parameter.symbol = "band6"; parameter.unit = "dB"; @@ -99,7 +99,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain7: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "126Hz"; parameter.symbol = "band7"; parameter.unit = "dB"; @@ -108,7 +108,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain8: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "158Hz"; parameter.symbol = "band8"; parameter.unit = "dB"; @@ -117,7 +117,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain9: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "200Hz"; parameter.symbol = "band9"; parameter.unit = "dB"; @@ -126,7 +126,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain10: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "251Hz"; parameter.symbol = "band10"; parameter.unit = "dB"; @@ -135,7 +135,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain11: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "316Hz"; parameter.symbol = "band11"; parameter.unit = "dB"; @@ -144,7 +144,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain12: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "398Hz"; parameter.symbol = "band12"; parameter.unit = "dB"; @@ -153,7 +153,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain13: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "501Hz"; parameter.symbol = "band13"; parameter.unit = "dB"; @@ -162,7 +162,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain14: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "631Hz"; parameter.symbol = "band14"; parameter.unit = "dB"; @@ -171,7 +171,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain15: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "794Hz"; parameter.symbol = "band15"; parameter.unit = "dB"; @@ -180,7 +180,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain16: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "999Hz"; parameter.symbol = "band16"; parameter.unit = "dB"; @@ -189,7 +189,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain17: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "1257Hz"; parameter.symbol = "band17"; parameter.unit = "dB"; @@ -198,7 +198,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain18: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "1584Hz"; parameter.symbol = "band18"; parameter.unit = "dB"; @@ -207,7 +207,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain19: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "1997Hz"; parameter.symbol = "band19"; parameter.unit = "dB"; @@ -216,7 +216,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain20: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "2514Hz"; parameter.symbol = "band20"; parameter.unit = "dB"; @@ -225,7 +225,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain21: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "3165Hz"; parameter.symbol = "band21"; parameter.unit = "dB"; @@ -234,7 +234,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain22: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "3986Hz"; parameter.symbol = "band22"; parameter.unit = "dB"; @@ -243,7 +243,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain23: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "5017Hz"; parameter.symbol = "band23"; parameter.unit = "dB"; @@ -252,7 +252,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain24: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "6318Hz"; parameter.symbol = "band24"; parameter.unit = "dB"; @@ -261,7 +261,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain25: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "7963Hz"; parameter.symbol = "band25"; parameter.unit = "dB"; @@ -270,7 +270,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain26: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "10032Hz"; parameter.symbol = "band26"; parameter.unit = "dB"; @@ -279,7 +279,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain27: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "12662Hz"; parameter.symbol = "band27"; parameter.unit = "dB"; @@ -288,7 +288,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain28: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "16081Hz"; parameter.symbol = "band28"; parameter.unit = "dB"; @@ -297,7 +297,7 @@ void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 12.0f; break; case paramGain29: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "20801Hz"; parameter.symbol = "band29"; parameter.unit = "dB"; diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.cpp b/plugins/ZamGEQ31/ZamGEQ31UI.cpp index 6abb498..77a848c 100644 --- a/plugins/ZamGEQ31/ZamGEQ31UI.cpp +++ b/plugins/ZamGEQ31/ZamGEQ31UI.cpp @@ -27,7 +27,7 @@ ZamGEQ31UI::ZamGEQ31UI() setSize(ZamGEQ31Artwork::zamgeq31Width, ZamGEQ31Artwork::zamgeq31Height); // background - fImgBackground = Image(ZamGEQ31Artwork::zamgeq31Data, ZamGEQ31Artwork::zamgeq31Width, ZamGEQ31Artwork::zamgeq31Height, GL_BGR); + fImgBackground = Image(ZamGEQ31Artwork::zamgeq31Data, ZamGEQ31Artwork::zamgeq31Width, ZamGEQ31Artwork::zamgeq31Height, kImageFormatBGR); // slider image Image sliderImage(ZamGEQ31Artwork::slidereqData, ZamGEQ31Artwork::slidereqWidth, ZamGEQ31Artwork::slidereqHeight); @@ -719,7 +719,8 @@ void ZamGEQ31UI::imageSliderValueChanged(ImageSlider* slider, float value) void ZamGEQ31UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamGate/ZamGatePlugin.cpp b/plugins/ZamGate/ZamGatePlugin.cpp index e3ecc34..86c056a 100644 --- a/plugins/ZamGate/ZamGatePlugin.cpp +++ b/plugins/ZamGate/ZamGatePlugin.cpp @@ -47,7 +47,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack"; parameter.symbol = "att"; parameter.unit = "ms"; @@ -56,7 +56,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -65,7 +65,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thr"; parameter.unit = "dB"; @@ -74,7 +74,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup"; parameter.symbol = "mak"; parameter.unit = "dB"; @@ -83,7 +83,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramSidechain: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sidechain"; parameter.symbol = "sidechain"; parameter.unit = " "; @@ -92,7 +92,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramGateclose: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Max gate close"; parameter.symbol = "close"; parameter.unit = "dB"; @@ -101,7 +101,7 @@ void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramOpenshut: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Mode open/shut"; parameter.symbol = "mode"; parameter.unit = " "; diff --git a/plugins/ZamGate/ZamGateUI.cpp b/plugins/ZamGate/ZamGateUI.cpp index e0db430..667613f 100644 --- a/plugins/ZamGate/ZamGateUI.cpp +++ b/plugins/ZamGate/ZamGateUI.cpp @@ -26,7 +26,7 @@ ZamGateUI::ZamGateUI() setSize(ZamGateArtwork::zamgateWidth, ZamGateArtwork::zamgateHeight); // background - fImgBackground = Image(ZamGateArtwork::zamgateData, ZamGateArtwork::zamgateWidth, ZamGateArtwork::zamgateHeight, GL_BGR); + fImgBackground = Image(ZamGateArtwork::zamgateData, ZamGateArtwork::zamgateWidth, ZamGateArtwork::zamgateHeight, kImageFormatBGR); // led images fLedRedImg = Image(ZamGateArtwork::ledredData, ZamGateArtwork::ledredWidth, ZamGateArtwork::ledredHeight); @@ -190,7 +190,8 @@ void ZamGateUI::imageSwitchClicked(ImageSwitch* tog, bool down) void ZamGateUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); // draw leds static const float sLedSpacing = 15.5f; @@ -229,7 +230,7 @@ void ZamGateUI::onDisplay() else numRedLeds = 0; for (int i=numRedLeds; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); if (fLedYellowValue >= 20.f) numYellowLeds = 19; @@ -273,12 +274,12 @@ void ZamGateUI::onDisplay() if (numYellowLeds > 12) { for (int i=12; i<numYellowLeds; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } else { for (int i=0; i<numYellowLeds; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } } diff --git a/plugins/ZamGateX2/ZamGateX2Plugin.cpp b/plugins/ZamGateX2/ZamGateX2Plugin.cpp index 7c3bf26..bb6a58c 100644 --- a/plugins/ZamGateX2/ZamGateX2Plugin.cpp +++ b/plugins/ZamGateX2/ZamGateX2Plugin.cpp @@ -47,7 +47,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramAttack: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Attack"; parameter.symbol = "att"; parameter.unit = "ms"; @@ -56,7 +56,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramRelease: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Release"; parameter.symbol = "rel"; parameter.unit = "ms"; @@ -65,7 +65,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 500.0f; break; case paramThresh: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Threshold"; parameter.symbol = "thr"; parameter.unit = "dB"; @@ -74,7 +74,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramMakeup: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Makeup"; parameter.symbol = "mak"; parameter.unit = "dB"; @@ -83,7 +83,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramGateclose: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Max gate close"; parameter.symbol = "close"; parameter.unit = "dB"; @@ -92,7 +92,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramSidechain: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Sidechain"; parameter.symbol = "sidechain"; parameter.unit = " "; @@ -101,7 +101,7 @@ void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramOpenshut: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Mode open/shut"; parameter.symbol = "mode"; parameter.unit = " "; diff --git a/plugins/ZamGateX2/ZamGateX2UI.cpp b/plugins/ZamGateX2/ZamGateX2UI.cpp index af6a737..c46eb78 100644 --- a/plugins/ZamGateX2/ZamGateX2UI.cpp +++ b/plugins/ZamGateX2/ZamGateX2UI.cpp @@ -26,7 +26,7 @@ ZamGateX2UI::ZamGateX2UI() setSize(ZamGateX2Artwork::zamgatex2Width, ZamGateX2Artwork::zamgatex2Height); // background - fImgBackground = Image(ZamGateX2Artwork::zamgatex2Data, ZamGateX2Artwork::zamgatex2Width, ZamGateX2Artwork::zamgatex2Height, GL_BGR); + fImgBackground = Image(ZamGateX2Artwork::zamgatex2Data, ZamGateX2Artwork::zamgatex2Width, ZamGateX2Artwork::zamgatex2Height, kImageFormatBGR); // led images fLedRedImg = Image(ZamGateX2Artwork::ledredData, ZamGateX2Artwork::ledredWidth, ZamGateX2Artwork::ledredHeight); @@ -186,7 +186,8 @@ void ZamGateX2UI::imageSwitchClicked(ImageSwitch* tog, bool down) void ZamGateX2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); // draw leds static const float sLedSpacing = 15.5f; @@ -225,7 +226,7 @@ void ZamGateX2UI::onDisplay() else numRedLeds = 0; for (int i=numRedLeds; i>0; --i) - fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY); if (fLedYellowValue >= 20.f) numYellowLeds = 19; @@ -269,12 +270,12 @@ void ZamGateX2UI::onDisplay() if (numYellowLeds > 12) { for (int i=12; i<numYellowLeds; ++i) - fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); for (int i=0; i<12; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } else { for (int i=0; i<numYellowLeds; ++i) - fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY); + fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY); } } diff --git a/plugins/ZamGrains/ZamGrainsPlugin.cpp b/plugins/ZamGrains/ZamGrainsPlugin.cpp index 71bfa3b..9004a9a 100644 --- a/plugins/ZamGrains/ZamGrainsPlugin.cpp +++ b/plugins/ZamGrains/ZamGrainsPlugin.cpp @@ -36,7 +36,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramDelaytime: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Loop time"; parameter.symbol = "time"; parameter.unit = "ms"; @@ -45,7 +45,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1000.0f; break; case paramGrains: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Grains"; parameter.symbol = "grains"; parameter.unit = " "; @@ -54,7 +54,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.0f; break; case paramGrainspeed: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Grain Speed"; parameter.symbol = "gs"; parameter.unit = " "; @@ -63,7 +63,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.f; break; case paramPlayspeed: - parameter.hints = kParameterIsAutomable | kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic; parameter.name = "Play Speed"; parameter.symbol = "ps"; parameter.unit = " "; @@ -72,7 +72,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.f; break; case paramGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Output Gain"; parameter.symbol = "gain"; parameter.unit = "dB"; @@ -81,7 +81,7 @@ void ZamGrainsPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 0.0f; break; case paramFreeze: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Freeze"; parameter.symbol = "freeze"; parameter.unit = " "; diff --git a/plugins/ZamGrains/ZamGrainsUI.cpp b/plugins/ZamGrains/ZamGrainsUI.cpp index c5c36f6..68de7e4 100644 --- a/plugins/ZamGrains/ZamGrainsUI.cpp +++ b/plugins/ZamGrains/ZamGrainsUI.cpp @@ -28,7 +28,7 @@ ZamGrainsUI::ZamGrainsUI() setSize(ZamGrainsArtwork::zamgrainsWidth, ZamGrainsArtwork::zamgrainsHeight); // background - fImgBackground = Image(ZamGrainsArtwork::zamgrainsData, ZamGrainsArtwork::zamgrainsWidth, ZamGrainsArtwork::zamgrainsHeight, GL_BGR); + fImgBackground = Image(ZamGrainsArtwork::zamgrainsData, ZamGrainsArtwork::zamgrainsWidth, ZamGrainsArtwork::zamgrainsHeight, kImageFormatBGR); // knob Image knobImage(ZamGrainsArtwork::knobData, ZamGrainsArtwork::knobWidth, ZamGrainsArtwork::knobHeight); @@ -184,6 +184,8 @@ void ZamGrainsUI::imageSwitchClicked(ImageSwitch* toggle, bool down) void ZamGrainsUI::onDisplay() { + const GraphicsContext& context(getGraphicsContext()); + int i; int grainx = 0; int grains = (int)fKnobGrains->getValue(); @@ -194,7 +196,7 @@ void ZamGrainsUI::onDisplay() int offsetx = 5; int offsety = 175; - fImgBackground.draw(); + fImgBackground.draw(context); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/plugins/ZamHeadX2/DistrhoPluginInfo.h b/plugins/ZamHeadX2/DistrhoPluginInfo.h index 1b97a12..cbf9048 100644 --- a/plugins/ZamHeadX2/DistrhoPluginInfo.h +++ b/plugins/ZamHeadX2/DistrhoPluginInfo.h @@ -27,11 +27,12 @@ #define DISTRHO_PLUGIN_NUM_INPUTS 2 #define DISTRHO_PLUGIN_NUM_OUTPUTS 2 -#define DISTRHO_PLUGIN_WANT_LATENCY 0 -#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 -#define DISTRHO_PLUGIN_WANT_STATE 1 -#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 -#define DISTRHO_PLUGIN_IS_RT_SAFE 1 +#define DISTRHO_PLUGIN_WANT_LATENCY 0 +#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 +#define DISTRHO_PLUGIN_WANT_STATE 1 +#define DISTRHO_PLUGIN_WANT_FULL_STATE 1 +#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 +#define DISTRHO_PLUGIN_IS_RT_SAFE 1 #define DISTRHO_PLUGIN_URI "urn:zamaudio:ZamHeadX2" #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:SpatialPlugin" diff --git a/plugins/ZamHeadX2/ZamHeadX2Plugin.cpp b/plugins/ZamHeadX2/ZamHeadX2Plugin.cpp index c9fc13d..329423c 100644 --- a/plugins/ZamHeadX2/ZamHeadX2Plugin.cpp +++ b/plugins/ZamHeadX2/ZamHeadX2Plugin.cpp @@ -87,7 +87,7 @@ void ZamHeadX2Plugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 90.0f; break; case paramWidth: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Width"; parameter.symbol = "width"; parameter.unit = " "; diff --git a/plugins/ZamHeadX2/ZamHeadX2UI.cpp b/plugins/ZamHeadX2/ZamHeadX2UI.cpp index 18f669b..6cf4fc6 100644 --- a/plugins/ZamHeadX2/ZamHeadX2UI.cpp +++ b/plugins/ZamHeadX2/ZamHeadX2UI.cpp @@ -28,7 +28,7 @@ ZamHeadX2UI::ZamHeadX2UI() setSize(ZamHeadX2Artwork::zamheadx2Width, ZamHeadX2Artwork::zamheadx2Height); // background - fImgBackground = Image(ZamHeadX2Artwork::zamheadx2Data, ZamHeadX2Artwork::zamheadx2Width, ZamHeadX2Artwork::zamheadx2Height, GL_BGR); + fImgBackground = Image(ZamHeadX2Artwork::zamheadx2Data, ZamHeadX2Artwork::zamheadx2Width, ZamHeadX2Artwork::zamheadx2Height, kImageFormatBGR); // knob Image knobImage(ZamHeadX2Artwork::knobData, ZamHeadX2Artwork::knobWidth, ZamHeadX2Artwork::knobHeight); @@ -118,7 +118,8 @@ void ZamHeadX2UI::imageKnobValueChanged(ZamKnob* knob, float value) void ZamHeadX2UI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } void ZamHeadX2UI::stateChanged(const char*, const char*) diff --git a/plugins/ZamHeadX2/convolution.cpp b/plugins/ZamHeadX2/convolution.cpp index 656e554..8f21269 100644 --- a/plugins/ZamHeadX2/convolution.cpp +++ b/plugins/ZamHeadX2/convolution.cpp @@ -447,7 +447,20 @@ void LV2convolv::clv_release (void) { } void LV2convolv::clv_clone_settings(LV2convolv *clv_new) { - memcpy (clv_new, this, sizeof(LV2convolv)); + convproc = clv_new->convproc; + ir_fn = clv_new->ir_fn; + ir_preset = clv_new->ir_preset; + ir_presetx = clv_new->ir_presetx; + ir_presety = clv_new->ir_presety; + memcpy (chn_inp, clv_new->chn_inp, sizeof(chn_inp)); + memcpy (chn_out, clv_new->chn_out, sizeof(chn_out)); + memcpy (ir_chan, clv_new->ir_chan, sizeof(ir_chan)); + memcpy (ir_delay, clv_new->ir_delay, sizeof(ir_delay)); + memcpy (ir_gain, clv_new->ir_gain, sizeof(ir_gain)); + size = clv_new->size; + density = clv_new->density; + fragment_size = clv_new->fragment_size; + clv_new->convproc = NULL; if (ir_fn) { clv_new->ir_fn = strdup (ir_fn); diff --git a/plugins/ZamNoise/ZamNoisePlugin.cpp b/plugins/ZamNoise/ZamNoisePlugin.cpp index 9b3beaa..32a716f 100644 --- a/plugins/ZamNoise/ZamNoisePlugin.cpp +++ b/plugins/ZamNoise/ZamNoisePlugin.cpp @@ -49,7 +49,7 @@ void ZamNoisePlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramNoiseToggle: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Noise Capture"; parameter.symbol = "noisecapture"; parameter.unit = ""; diff --git a/plugins/ZamNoise/ZamNoiseUI.cpp b/plugins/ZamNoise/ZamNoiseUI.cpp index 80ac1bb..a27368f 100644 --- a/plugins/ZamNoise/ZamNoiseUI.cpp +++ b/plugins/ZamNoise/ZamNoiseUI.cpp @@ -28,7 +28,7 @@ ZamNoiseUI::ZamNoiseUI() setSize(ZamNoiseArtwork::zamnoiseWidth, ZamNoiseArtwork::zamnoiseHeight); // background - fImgBackground = Image(ZamNoiseArtwork::zamnoiseData, ZamNoiseArtwork::zamnoiseWidth, ZamNoiseArtwork::zamnoiseHeight, GL_BGR); + fImgBackground = Image(ZamNoiseArtwork::zamnoiseData, ZamNoiseArtwork::zamnoiseWidth, ZamNoiseArtwork::zamnoiseHeight, kImageFormatBGR); // toggle img Image toggleonImage(ZamNoiseArtwork::toggleonData, ZamNoiseArtwork::toggleonWidth, ZamNoiseArtwork::toggleonHeight); diff --git a/plugins/ZamPhono/ZamPhonoPlugin.cpp b/plugins/ZamPhono/ZamPhonoPlugin.cpp index b2ea51c..96bfcde 100644 --- a/plugins/ZamPhono/ZamPhonoPlugin.cpp +++ b/plugins/ZamPhono/ZamPhonoPlugin.cpp @@ -34,7 +34,7 @@ void ZamPhonoPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramToggle: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Reproduction/Production"; parameter.symbol = "inv"; parameter.unit = " "; @@ -43,7 +43,7 @@ void ZamPhonoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramType: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Phono Filter Type"; parameter.symbol = "type"; parameter.unit = " "; diff --git a/plugins/ZamPhono/ZamPhonoUI.cpp b/plugins/ZamPhono/ZamPhonoUI.cpp index 6030aa1..384311e 100644 --- a/plugins/ZamPhono/ZamPhonoUI.cpp +++ b/plugins/ZamPhono/ZamPhonoUI.cpp @@ -27,7 +27,7 @@ ZamPhonoUI::ZamPhonoUI() setSize(ZamPhonoArtwork::zamphonoWidth, ZamPhonoArtwork::zamphonoHeight); // background - fImgBackground = Image(ZamPhonoArtwork::zamphonoData, ZamPhonoArtwork::zamphonoWidth, ZamPhonoArtwork::zamphonoHeight, GL_BGR); + fImgBackground = Image(ZamPhonoArtwork::zamphonoData, ZamPhonoArtwork::zamphonoWidth, ZamPhonoArtwork::zamphonoHeight, kImageFormatBGR); // notch slider Image sliderImage(ZamPhonoArtwork::sliderData, ZamPhonoArtwork::sliderWidth, ZamPhonoArtwork::sliderHeight); @@ -109,7 +109,8 @@ void ZamPhonoUI::imageSwitchClicked(ImageSwitch* toggle, bool down) void ZamPhonoUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamPiano/ZamPianoPlugin.cpp b/plugins/ZamPiano/ZamPianoPlugin.cpp index 3c8dc8d..eb0935a 100644 --- a/plugins/ZamPiano/ZamPianoPlugin.cpp +++ b/plugins/ZamPiano/ZamPianoPlugin.cpp @@ -45,7 +45,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramFreq: // fentry0 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Tone Frequency"; parameter.symbol = "freq"; parameter.unit = "Hz"; @@ -54,7 +54,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20000.0f; break; case paramGain: // fentry1 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Gain"; parameter.symbol = "gain"; parameter.unit = ""; @@ -63,7 +63,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramGate: // fbutton0 - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Gate"; parameter.symbol = "gate"; parameter.unit = ""; @@ -72,7 +72,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramBright: // fslider0 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Brightness"; parameter.symbol = "brightness"; parameter.unit = ""; @@ -81,7 +81,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramDetuning: // fslider3 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Detuning"; parameter.symbol = "detuning"; parameter.unit = ""; @@ -90,7 +90,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramHammerHard: // fslider1 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Hammer Hardness"; parameter.symbol = "hammerhard"; parameter.unit = ""; @@ -99,7 +99,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramStiffness: // fslider2 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Stiffness"; parameter.symbol = "stiffness"; parameter.unit = ""; @@ -108,7 +108,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramReverbGain: // fslider4 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Reverb Gain"; parameter.symbol = "reverbgain"; parameter.unit = ""; @@ -117,7 +117,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramReverbRoom: // fslider6 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Reverb Room Size"; parameter.symbol = "reverbroom"; parameter.unit = ""; @@ -126,7 +126,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 2.0f; break; case paramPanAngle: // fslider5 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Pan Angle"; parameter.symbol = "panangle"; parameter.unit = ""; @@ -135,7 +135,7 @@ void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramSpatialWidth: // fslider7 - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Spatial Width"; parameter.symbol = "spatialwidth"; parameter.unit = ""; diff --git a/plugins/ZamPiano/ZamPianoUI.cpp b/plugins/ZamPiano/ZamPianoUI.cpp index de66734..ac5dbbb 100644 --- a/plugins/ZamPiano/ZamPianoUI.cpp +++ b/plugins/ZamPiano/ZamPianoUI.cpp @@ -28,7 +28,7 @@ ZamPianoUI::ZamPianoUI() setSize(ZamPianoArtwork::zampianoWidth, ZamPianoArtwork::zampianoHeight); // background - fImgBackground = Image(ZamPianoArtwork::zampianoData, ZamPianoArtwork::zampianoWidth, ZamPianoArtwork::zampianoHeight, GL_BGR); + fImgBackground = Image(ZamPianoArtwork::zampianoData, ZamPianoArtwork::zampianoWidth, ZamPianoArtwork::zampianoHeight, kImageFormatBGR); // knob Image knobImage(ZamPianoArtwork::knobData, ZamPianoArtwork::knobWidth, ZamPianoArtwork::knobHeight); diff --git a/plugins/ZamSFZ/ZamSFZPlugin.cpp b/plugins/ZamSFZ/ZamSFZPlugin.cpp index 322d785..3b3d1f3 100644 --- a/plugins/ZamSFZ/ZamSFZPlugin.cpp +++ b/plugins/ZamSFZ/ZamSFZPlugin.cpp @@ -45,7 +45,7 @@ void ZamSFZPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 1.0f; break; case paramGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Gain"; parameter.symbol = "gain"; parameter.unit = "dB"; diff --git a/plugins/ZamSFZ/ZamSFZUI.cpp b/plugins/ZamSFZ/ZamSFZUI.cpp index 61e5e55..fafc3fe 100644 --- a/plugins/ZamSFZ/ZamSFZUI.cpp +++ b/plugins/ZamSFZ/ZamSFZUI.cpp @@ -30,7 +30,7 @@ ZamSFZUI::ZamSFZUI() setSize(ZamSFZArtwork::zamsfzWidth, ZamSFZArtwork::zamsfzHeight); // background - fImgBackground = Image(ZamSFZArtwork::zamsfzData, ZamSFZArtwork::zamsfzWidth, ZamSFZArtwork::zamsfzHeight, GL_BGR); + fImgBackground = Image(ZamSFZArtwork::zamsfzData, ZamSFZArtwork::zamsfzWidth, ZamSFZArtwork::zamsfzHeight, kImageFormatBGR); // knob Image knobImage(ZamSFZArtwork::knobData, ZamSFZArtwork::knobWidth, ZamSFZArtwork::knobHeight); diff --git a/plugins/ZamSynth/ZamSynthPlugin.cpp b/plugins/ZamSynth/ZamSynthPlugin.cpp index 24c09aa..12a9ac7 100644 --- a/plugins/ZamSynth/ZamSynthPlugin.cpp +++ b/plugins/ZamSynth/ZamSynthPlugin.cpp @@ -59,7 +59,7 @@ void ZamSynthPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Gain"; parameter.symbol = "gain"; parameter.unit = "dB"; @@ -68,7 +68,7 @@ void ZamSynthPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramSpeed: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Speed"; parameter.symbol = "speed"; parameter.unit = " "; @@ -77,7 +77,7 @@ void ZamSynthPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 20.0f; break; case paramGraph: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Graph toggle"; parameter.symbol = "graph"; parameter.unit = " "; diff --git a/plugins/ZamSynth/ZamSynthUI.cpp b/plugins/ZamSynth/ZamSynthUI.cpp index 8b55dd6..4b869d2 100644 --- a/plugins/ZamSynth/ZamSynthUI.cpp +++ b/plugins/ZamSynth/ZamSynthUI.cpp @@ -30,7 +30,7 @@ ZamSynthUI::ZamSynthUI() setSize(ZamSynthArtwork::zamsynthWidth, ZamSynthArtwork::zamsynthHeight); // background - fImgBackground = Image(ZamSynthArtwork::zamsynthData, ZamSynthArtwork::zamsynthWidth, ZamSynthArtwork::zamsynthHeight, GL_BGR); + fImgBackground = Image(ZamSynthArtwork::zamsynthData, ZamSynthArtwork::zamsynthWidth, ZamSynthArtwork::zamsynthHeight, kImageFormatBGR); fDragging = false; fDragValid = false; diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index 4587b03..e3e7ad6 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -78,7 +78,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramTubedrive: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Tube Drive"; parameter.symbol = "tubedrive"; parameter.unit = " "; @@ -87,7 +87,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 11.0f; break; case paramBass: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Bass"; parameter.symbol = "bass"; parameter.unit = " "; @@ -96,7 +96,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 10.0f; break; case paramMiddle: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Mids"; parameter.symbol = "mids"; parameter.unit = " "; @@ -105,7 +105,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 10.0f; break; case paramTreble: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Treble"; parameter.symbol = "treb"; parameter.unit = " "; @@ -114,7 +114,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 10.0f; break; case paramToneStack: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Tone Stack Model"; parameter.symbol = "tonestack"; parameter.unit = " "; @@ -180,7 +180,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) } break; case paramGain: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Input level"; parameter.symbol = "gain"; parameter.unit = " "; @@ -189,7 +189,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramInsane: - parameter.hints = kParameterIsAutomable | kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.name = "Insane Boost"; parameter.symbol = "insane"; parameter.unit = " "; diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp index e61f6f0..271de71 100644 --- a/plugins/ZamTube/ZamTubeUI.cpp +++ b/plugins/ZamTube/ZamTubeUI.cpp @@ -33,7 +33,7 @@ ZamTubeUI::ZamTubeUI() setSize(ZamTubeArtwork::zamtubeWidth, ZamTubeArtwork::zamtubeHeight); // background - fImgBackground = Image(ZamTubeArtwork::zamtubeData, ZamTubeArtwork::zamtubeWidth, ZamTubeArtwork::zamtubeHeight, GL_BGR); + fImgBackground = Image(ZamTubeArtwork::zamtubeData, ZamTubeArtwork::zamtubeWidth, ZamTubeArtwork::zamtubeHeight, kImageFormatBGR); // knob Image knobImage(ZamTubeArtwork::knobData, ZamTubeArtwork::knobWidth, ZamTubeArtwork::knobHeight); @@ -229,7 +229,8 @@ void ZamTubeUI::imageSwitchClicked(ImageSwitch* toggle, bool down) void ZamTubeUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamVerb/DistrhoPluginInfo.h b/plugins/ZamVerb/DistrhoPluginInfo.h index 0077f94..eb3999e 100644 --- a/plugins/ZamVerb/DistrhoPluginInfo.h +++ b/plugins/ZamVerb/DistrhoPluginInfo.h @@ -27,10 +27,11 @@ #define DISTRHO_PLUGIN_NUM_INPUTS 2 #define DISTRHO_PLUGIN_NUM_OUTPUTS 2 -#define DISTRHO_PLUGIN_WANT_LATENCY 0 -#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 -#define DISTRHO_PLUGIN_WANT_STATE 1 -#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 +#define DISTRHO_PLUGIN_WANT_LATENCY 0 +#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 +#define DISTRHO_PLUGIN_WANT_STATE 1 +#define DISTRHO_PLUGIN_WANT_FULL_STATE 1 +#define DISTRHO_PLUGIN_WANT_TIMEPOS 0 #define DISTRHO_PLUGIN_URI "urn:zamaudio:ZamVerb" #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:ReverbPlugin" diff --git a/plugins/ZamVerb/ZamVerbPlugin.cpp b/plugins/ZamVerb/ZamVerbPlugin.cpp index 906bc9d..d4235f8 100644 --- a/plugins/ZamVerb/ZamVerbPlugin.cpp +++ b/plugins/ZamVerb/ZamVerbPlugin.cpp @@ -70,7 +70,7 @@ void ZamVerbPlugin::initParameter(uint32_t index, Parameter& parameter) switch (index) { case paramMaster: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Master level"; parameter.symbol = "master"; parameter.unit = "dB"; @@ -79,7 +79,7 @@ void ZamVerbPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 30.0f; break; case paramWetdry: - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.name = "Wet / Dry"; parameter.symbol = "wetdry"; parameter.unit = "%"; @@ -88,7 +88,7 @@ void ZamVerbPlugin::initParameter(uint32_t index, Parameter& parameter) parameter.ranges.max = 100.f; break; case paramRoom: - parameter.hints = kParameterIsAutomable | kParameterIsInteger; + parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.name = "Room"; parameter.symbol = "room"; parameter.unit = " "; diff --git a/plugins/ZamVerb/ZamVerbUI.cpp b/plugins/ZamVerb/ZamVerbUI.cpp index 7ef02c7..1088e62 100644 --- a/plugins/ZamVerb/ZamVerbUI.cpp +++ b/plugins/ZamVerb/ZamVerbUI.cpp @@ -28,7 +28,7 @@ ZamVerbUI::ZamVerbUI() setSize(ZamVerbArtwork::zamverbWidth, ZamVerbArtwork::zamverbHeight); // background - fImgBackground = Image(ZamVerbArtwork::zamverbData, ZamVerbArtwork::zamverbWidth, ZamVerbArtwork::zamverbHeight, GL_BGR); + fImgBackground = Image(ZamVerbArtwork::zamverbData, ZamVerbArtwork::zamverbWidth, ZamVerbArtwork::zamverbHeight, kImageFormatBGR); // knob Image knobImage(ZamVerbArtwork::knobData, ZamVerbArtwork::knobWidth, ZamVerbArtwork::knobHeight); @@ -148,7 +148,8 @@ void ZamVerbUI::imageSliderValueChanged(ImageSlider*, float value) void ZamVerbUI::onDisplay() { - fImgBackground.draw(); + const GraphicsContext& context(getGraphicsContext()); + fImgBackground.draw(context); } // ----------------------------------------------------------------------- diff --git a/plugins/ZamVerb/convolution.cpp b/plugins/ZamVerb/convolution.cpp index d2b2d4e..57f04b2 100644 --- a/plugins/ZamVerb/convolution.cpp +++ b/plugins/ZamVerb/convolution.cpp @@ -139,7 +139,18 @@ void LV2convolv::clv_release (void) { } void LV2convolv::clv_clone_settings(LV2convolv *clv_new) { - memcpy (clv_new, this, sizeof(LV2convolv)); + convproc = clv_new->convproc; + ir_fn = clv_new->ir_fn; + ir_preset = clv_new->ir_preset; + memcpy (chn_inp, clv_new->chn_inp, sizeof(chn_inp)); + memcpy (chn_out, clv_new->chn_out, sizeof(chn_out)); + memcpy (ir_chan, clv_new->ir_chan, sizeof(ir_chan)); + memcpy (ir_delay, clv_new->ir_delay, sizeof(ir_delay)); + memcpy (ir_gain, clv_new->ir_gain, sizeof(ir_gain)); + size = clv_new->size; + density = clv_new->density; + fragment_size = clv_new->fragment_size; + clv_new->convproc = NULL; if (ir_fn) { clv_new->ir_fn = strdup (ir_fn); |