Merge pull request iPlug2#604 from iPlug2/VST3/parameter-management

Fix iPlug2#488 Control binded to a param not redrawn when automated (Live/VST3)

Author: olilarkin

IPlug/IPlugAPIBase.cpp

@@ -152,8 +152,8 @@ void IPlugAPIBase::OnTimer(Timer& t)
 {
   if(HasUI())
   {
-    // in distributed VST3, parameter changes are managed by the host
-  #if !defined VST3C_API && !defined VST3P_API // && !defined VST3_API
+    // in VST3, parameter changes are managed by the host
+  #if !defined VST3C_API && !defined VST3P_API && !defined VST3_API
     while(mParamChangeFromProcessor.ElementsAvailable())
     {
       ParamTuple p;
@@ -176,8 +176,8 @@ void IPlugAPIBase::OnTimer(Timer& t)
     }
   #endif
 
-    // Midi messages from the processor to the controller, are sent as IMessages and SendMidiMsgFromDelegate gets triggered on the other side's notify
-  #if defined VST3P_API // || defined VST3_API
+    // In VST3 midi messages from the processor to the controller, are sent as IMessages and SendMidiMsgFromDelegate gets triggered on the other side's notify
+  #if defined VST3P_API || defined VST3_API
     while (mMidiMsgsFromProcessor.ElementsAvailable())
     {
       IMidiMsg msg;

IPlug/VST3/IPlugVST3.cpp

@@ -123,17 +123,15 @@ tresult PLUGIN_API IPlugVST3::getState(IBStream* pState)
 #pragma mark IEditController overrides
 ParamValue PLUGIN_API IPlugVST3::getParamNormalized(ParamID tag)
 {
-  if (tag >= kBypassParam)
-    return EditControllerEx1::getParamNormalized(tag);
-  
-  return IPlugVST3ControllerBase::GetParamNormalized(this, tag);
+  return IPlugVST3ControllerBase::GetParamNormalized(parameters, tag);
 }
 
 tresult PLUGIN_API IPlugVST3::setParamNormalized(ParamID tag, ParamValue value)
 {
-  IPlugVST3ControllerBase::SetParamNormalized(this, tag, value);
-  
-  return EditControllerEx1::setParamNormalized(tag, value);
+  if (IPlugVST3ControllerBase::SetParamNormalized(this, parameters, tag, value))
+    return kResultTrue;
+  else
+    return kResultFalse;
 }
 
 IPlugView* PLUGIN_API IPlugVST3::createView(const char* name)
@@ -224,13 +222,21 @@ bool IPlugVST3::EditorResize(int viewWidth, int viewHeight)
   return true;
 }
 
+#pragma mark IEditorDelegate overrides
+
 void IPlugVST3::DirtyParametersFromUI()
 {
   startGroupEdit();
   IPlugAPIBase::DirtyParametersFromUI();
   finishGroupEdit();
 }
 
+void IPlugVST3::SendParameterValueFromUI(int paramIdx, double normalisedValue)
+{
+  IPlugVST3ControllerBase::SetVST3ParamNormalized(parameters, paramIdx, normalisedValue);
+  IPlugAPIBase::SendParameterValueFromUI(paramIdx, normalisedValue);
+}
+
 void IPlugVST3::SetLatency(int latency)
 {
   IPlugProcessor::SetLatency(latency);

IPlug/VST3/IPlugVST3.h

@@ -65,7 +65,8 @@ class IPlugVST3 : public IPlugAPIBase
 
   // IEditorDelegate
   void DirtyParametersFromUI() override;
-  
+  void SendParameterValueFromUI(int paramIdx, double normalisedValue) override;
+
   // IPlugProcessor
   void SetLatency(int samples) override;
 

IPlug/VST3/IPlugVST3_Controller.cpp

@@ -43,7 +43,13 @@ tresult PLUGIN_API IPlugVST3Controller::initialize(FUnknown* context)
     Initialize(this, parameters, mPlugIsInstrument, mDoesMidiIn);
     IPlugVST3GetHost(this, context);
     OnHostIdentified();
-
+    OnParamReset(kReset);
+    
+    // Load iplug parameters into the GUI thread visible values
+    
+    for (int i = 0; i < NParams(); ++i)
+      parameters.getParameter(i)->setNormalized(GetParam(i)->GetNormalized());
+    
     return kResultTrue;
   }
 
@@ -80,17 +86,15 @@ tresult PLUGIN_API IPlugVST3Controller::getState(IBStream* pState)
 
 ParamValue PLUGIN_API IPlugVST3Controller::getParamNormalized(ParamID tag)
 {
-  if (tag >= kBypassParam)
-    return EditControllerEx1::getParamNormalized(tag);
-  
-  return IPlugVST3ControllerBase::GetParamNormalized(this, tag);
+  return IPlugVST3ControllerBase::GetParamNormalized(parameters, tag);
 }
 
 tresult PLUGIN_API IPlugVST3Controller::setParamNormalized(ParamID tag, ParamValue value)
 {
-  IPlugVST3ControllerBase::SetParamNormalized(this, tag, value);
-  
-  return EditControllerEx1::setParamNormalized(tag, value);
+  if (IPlugVST3ControllerBase::SetParamNormalized(this, parameters, tag, value))
+    return kResultTrue;
+  else
+    return kResultFalse;
 }
 
 tresult PLUGIN_API IPlugVST3Controller::getMidiControllerAssignment(int32 busIndex, int16 midiChannel, CtrlNumber midiCCNumber, ParamID& tag)
@@ -278,3 +282,9 @@ void IPlugVST3Controller::SendArbitraryMsgFromUI(int msgTag, int ctrlTag, int da
   message->getAttributes()->setBinary("D", pData, dataSize);
   sendMessage(message);
 }
+
+void IPlugVST3Controller::SendParameterValueFromUI(int paramIdx, double normalisedValue)
+{
+  IPlugVST3ControllerBase::SetVST3ParamNormalized(parameters, paramIdx, normalisedValue);
+  IPlugAPIBase::SendParameterValueFromUI(paramIdx, normalisedValue);
+}

IPlug/VST3/IPlugVST3_Controller.h

@@ -104,6 +104,7 @@ class IPlugVST3Controller : public Steinberg::Vst::EditControllerEx1
   void SendMidiMsgFromUI(const IMidiMsg& msg) override;
   void SendSysexMsgFromUI(const ISysEx& msg) override;
   void SendArbitraryMsgFromUI(int msgTag, int ctrlTag = kNoTag, int dataSize = 0, const void* pData = nullptr) override;
+  void SendParameterValueFromUI(int paramIdx, double normalisedValue) override;
 
   Steinberg::Vst::IComponentHandler* GetComponentHandler() const { return componentHandler; }
   ViewType* GetView() const { return mView; }

IPlug/VST3/IPlugVST3_ControllerBase.h

@@ -154,20 +154,17 @@ class IPlugVST3ControllerBase
 #endif
   }
 
-  Steinberg::Vst::ParamValue PLUGIN_API GetParamNormalized(IPlugAPIBase* pPlug, Steinberg::Vst::ParamID tag)
+  Steinberg::Vst::ParamValue GetParamNormalized(Steinberg::Vst::ParameterContainer& parameters, Steinberg::Vst::ParamID tag)
   {
-    IParam* param = pPlug->GetParam(tag);
-        
-    if (param)
-    {
-      return param->GetNormalized();
-    }
-        
-    return 0.0;
+    Steinberg::Vst::Parameter* parameter = parameters.getParameter(tag);
+    return parameter ? parameter->getNormalized() : 0.0;
   }
 
-  void PLUGIN_API SetParamNormalized(IPlugAPIBase* pPlug, Steinberg::Vst::ParamID tag, Steinberg::Vst::ParamValue value)
+  bool SetParamNormalized(IPlugAPIBase* pPlug, Steinberg::Vst::ParameterContainer& parameters, Steinberg::Vst::ParamID tag, Steinberg::Vst::ParamValue value)
   {
+    if (!SetVST3ParamNormalized(parameters, tag, value))
+      return false;
+    
     if (tag >= kBypassParam)
     {
       switch (tag)
@@ -190,14 +187,11 @@ class IPlugVST3ControllerBase
         pParam->SetNormalized(value);
         pPlug->OnParamChangeUI(tag, kHost);
 
-// in VST3, parameter changes are managed by the host
-#if !defined VST3C_API // && !defined VST3_API //TODO
-        pPlug->SendParameterValueFromAPI(tag, value, true);
-#else
         pPlug->SendParameterValueFromDelegate(tag, value, true);
-#endif
       }
     }
+    
+    return true;
   }
 
   bool SetChannelContextInfos(Steinberg::Vst::IAttributeList* pList)
@@ -303,6 +297,19 @@ class IPlugVST3ControllerBase
     return false;
   }
 
+protected:
+  
+  bool SetVST3ParamNormalized(Steinberg::Vst::ParameterContainer& parameters, Steinberg::Vst::ParamID tag, Steinberg::Vst::ParamValue value)
+  {
+    Steinberg::Vst::Parameter* parameter = parameters.getParameter(tag);
+    
+    if (!parameter)
+      return false;
+    
+    parameter->setNormalized(value);
+    return true;
+  }
+  
 public:
   IPlugVST3BypassParameter* mBypassParameter = nullptr;
 

IPlug/VST3/IPlugVST3_Processor.cpp

@@ -37,6 +37,8 @@ tresult PLUGIN_API IPlugVST3Processor::initialize(FUnknown* context)
     Initialize(this);
     IPlugVST3GetHost(this, context);
     OnHostIdentified();
+    OnParamReset(kReset);
+    
     return kResultOk;
   }