From 2e7fbf895d955a92a48a546090552913fa898627 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 8 Feb 2015 17:40:14 +0000 Subject: [PATCH] Continue previous commit --- source/backend/plugin/CarlaPlugin.cpp | 10 ++++++---- source/utils/CarlaStateUtils.cpp | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 9e3c5f428..b4ecd378e 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -585,10 +585,13 @@ const CarlaStateSave& CarlaPlugin::getStateSave(const bool callPrepareForSave) getParameterSymbol(i, strBuf); stateParameter->symbol = carla_strdup(strBuf);; - stateParameter->value = getParameterValue(i); + if (! dummy) + { + stateParameter->value = getParameterValue(i); - if (paramData.hints & PARAMETER_USES_SAMPLERATE) - stateParameter->value /= sampleRate; + if (paramData.hints & PARAMETER_USES_SAMPLERATE) + stateParameter->value /= sampleRate; + } pData->stateSave.parameters.append(stateParameter); } @@ -841,7 +844,6 @@ void CarlaPlugin::loadStateSave(const CarlaStateSave& stateSave) if (availOptions & option) setOption(option, (stateSave.options & option) != 0, true); - } setDryWet(stateSave.dryWet, true, true); diff --git a/source/utils/CarlaStateUtils.cpp b/source/utils/CarlaStateUtils.cpp index 9f53d48f8..f5301d496 100644 --- a/source/utils/CarlaStateUtils.cpp +++ b/source/utils/CarlaStateUtils.cpp @@ -116,7 +116,7 @@ static const char* xmlSafeStringCharDup(const String& string, const bool toXml) // StateParameter CarlaStateSave::Parameter::Parameter() noexcept - : dummy(false), + : dummy(true), index(-1), name(nullptr), symbol(nullptr), @@ -426,9 +426,9 @@ bool CarlaStateSave::fillFromXmlElement(const XmlElement* const xmlElement) } else if (pTag.equalsIgnoreCase("value")) { + stateParameter->dummy = false; stateParameter->value = pText.getFloatValue(); } - #ifndef BUILD_BRIDGE else if (pTag.equalsIgnoreCase("midichannel") || pTag.equalsIgnoreCase("midi-channel")) {