Make NAM disablable - bypass dry signal

NeuralAmpModeler/NeuralAmpModeler.cpp

@@ -81,6 +81,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
   GetParam(kEQActive)->InitBool("ToneStack", true);
   GetParam(kOutNorm)->InitBool("OutNorm", true);
   GetParam(kIRToggle)->InitBool("IRToggle", true);
+  GetParam(kNamToggle)->InitBool("NAMToggle", mNamActive);
 
   mNoiseGateTrigger.AddListener(&mNoiseGateGain);
 
@@ -202,7 +203,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
 
     pGraphics->AttachBackground(BACKGROUND_FN);
     pGraphics->AttachControl(new IBitmapControl(b, linesBitmap));
-    pGraphics->AttachControl(new IVLabelControl(titleArea, "NEURAL AMP MODELER", titleStyle));
+    pGraphics->AttachControl(new NAMTitleToggleControl(titleArea, kNamToggle, titleStyle.valueText));
     pGraphics->AttachControl(new ISVGControl(modelIconArea, modelIconSVG));
 
 #ifdef NAM_PICK_DIRECTORY
@@ -258,7 +259,10 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
       pControl->SetMouseOverWhenDisabled(true);
     });
 
-    pGraphics->GetControlWithTag(kCtrlTagOutNorm)->SetMouseEventsWhenDisabled(false);
+    pGraphics->GetControlWithParamIdx(kOutNorm)->SetMouseEventsWhenDisabled(false);
+    pGraphics->GetControlWithParamIdx(kNoiseGateActive)->SetMouseEventsWhenDisabled(false);
+    pGraphics->GetControlWithParamIdx(kEQActive)->SetMouseEventsWhenDisabled(false);
+    pGraphics->GetControlWithParamIdx(kIRToggle)->SetMouseEventsWhenDisabled(false);
   };
 }
 
@@ -275,6 +279,13 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp
   const size_t numFrames = (size_t)nFrames;
   const double sampleRate = GetSampleRate();
 
+  if (!mNamActive)
+  {
+    _ProcessOutput(inputs, outputs, numFrames, numChannelsInternal, numChannelsExternalOut);
+    _UpdateMeters(inputs, outputs, numFrames, numChannelsInternal, numChannelsExternalOut);
+    return;
+  }
+
   // Disable floating point denormals
   std::fenv_t fe_state;
   std::feholdexcept(&fe_state);
@@ -379,7 +390,8 @@ void NeuralAmpModeler::OnIdle()
   {
     if (auto* pGraphics = GetUI())
     {
-      pGraphics->GetControlWithTag(kCtrlTagOutNorm)->SetDisabled(!mModel->HasLoudness());
+      pGraphics->GetControlWithTag(kCtrlTagOutNorm)
+        ->SetDisabled(!mModel->HasLoudness() || !GetParam(kNamToggle)->Value());
       ModelInfo modelInfo;
       modelInfo.sampleRate = mModel->GetEncapsulatedSampleRate();
       modelInfo.knownSampleRate = true;
@@ -426,7 +438,17 @@ int NeuralAmpModeler::UnserializeState(const IByteChunk& chunk, int startPos)
     const char* kExpectedHeader = "###NeuralAmpModeler###";
     if (strcmp(header.Get(), kExpectedHeader) == 0)
     {
-      pos = _UnserializeStateCurrent(chunk, pos);
+      WDL_String version;
+      pos = chunk.GetStr(version, pos);
+
+      if (strcmp(version.Get(), "0.7.10") == 0)
+      {
+        pos = _UnserializeStateLegacy_0_7_9(chunk, pos);
+      }
+      else
+      {
+        pos = _UnserializeStateCurrent(chunk, pos);
+      }
     }
     else
     {
@@ -471,6 +493,7 @@ void NeuralAmpModeler::OnParamChange(int paramIdx)
     case kToneBass: mToneStack->SetParam("bass", GetParam(paramIdx)->Value()); break;
     case kToneMid: mToneStack->SetParam("middle", GetParam(paramIdx)->Value()); break;
     case kToneTreble: mToneStack->SetParam("treble", GetParam(paramIdx)->Value()); break;
+    case kNamToggle: mNamActive = GetParam(paramIdx)->Value(); break;
     default: break;
   }
 }
@@ -487,7 +510,8 @@ void NeuralAmpModeler::OnParamChangeUI(int paramIdx, EParamSource source)
       case kEQActive:
         pGraphics->ForControlInGroup("EQ_KNOBS", [active](IControl* pControl) { pControl->SetDisabled(!active); });
         break;
-      case kIRToggle: pGraphics->GetControlWithTag(kCtrlTagIRFileBrowser)->SetDisabled(!active);
+      case kIRToggle: pGraphics->GetControlWithTag(kCtrlTagIRFileBrowser)->SetDisabled(!active); break;
+      case kNamToggle: _SetDisabledForAllControl(!active); break;
       default: break;
     }
   }
@@ -807,7 +831,7 @@ void NeuralAmpModeler::_ProcessInput(iplug::sample** inputs, const size_t nFrame
 void NeuralAmpModeler::_ProcessOutput(iplug::sample** inputs, iplug::sample** outputs, const size_t nFrames,
                                       const size_t nChansIn, const size_t nChansOut)
 {
-  const double gain = pow(10.0, GetParam(kOutputLevel)->Value() / 20.0);
+  const double gain = mNamActive ? pow(10.0, GetParam(kOutputLevel)->Value() / 20.0) : 1;
   // Assume _PrepareBuffers() was already called
   if (nChansIn != 1)
     throw std::runtime_error("Plugin is supposed to process in mono.");
@@ -825,8 +849,6 @@ void NeuralAmpModeler::_ProcessOutput(iplug::sample** inputs, iplug::sample** ou
 
 int NeuralAmpModeler::_UnserializeStateCurrent(const IByteChunk& chunk, int pos)
 {
-  WDL_String version;
-  pos = chunk.GetStr(version, pos);
   // Post-v0.7.9 legacy loading here once needed:
   // ...
 
@@ -922,3 +944,24 @@ void NeuralAmpModeler::_UpdateMeters(sample** inputPointer, sample** outputPoint
   mInputSender.ProcessBlock(inputPointer, (int)nFrames, kCtrlTagInputMeter, nChansHack);
   mOutputSender.ProcessBlock(outputPointer, (int)nFrames, kCtrlTagOutputMeter, nChansHack);
 }
+
+void NeuralAmpModeler::_SetDisabledForAllControl(const bool disabled)
+{
+  if (const auto ui = GetUI(); ui != nullptr)
+  {
+    ui->GetControlWithParamIdx(kEQActive)->SetDisabled(disabled);
+    ui->GetControlWithParamIdx(kOutNorm)->SetDisabled(disabled);
+
+    ui->GetControlWithTag(kCtrlTagModelFileBrowser)->SetDisabled(disabled);
+    ui->GetControlWithTag(kCtrlTagIRFileBrowser)->SetDisabled(disabled);
+
+    ui->GetControlWithParamIdx(kNoiseGateActive)->SetDisabled(disabled);
+    ui->GetControlWithParamIdx(kNoiseGateThreshold)->SetDisabled(disabled || !GetParam(kNoiseGateActive)->Value());
+    ui->GetControlWithParamIdx(kInputLevel)->SetDisabled(disabled);
+    ui->GetControlWithParamIdx(kOutputLevel)->SetDisabled(disabled);
+    ui->GetControlWithParamIdx(kIRToggle)->SetDisabled(disabled);
+
+    ui->ForControlInGroup(
+      "EQ_KNOBS", [disabled, this](auto* ctrl) { ctrl->SetDisabled(disabled || !GetParam(kEQActive)->Value()); });
+  }
+}

NeuralAmpModeler/NeuralAmpModeler.h

@@ -41,6 +41,7 @@ enum EParams
   kEQActive,
   kOutNorm,
   kIRToggle,
+  kNamToggle,
   kNumParams
 };
 
@@ -243,6 +244,9 @@ class NeuralAmpModeler final : public iplug::Plugin
   void _UpdateMeters(iplug::sample** inputPointer, iplug::sample** outputPointer, const size_t nFrames,
                      const size_t nChansIn, const size_t nChansOut);
 
+  // Toggles Disabled flag for all controls
+  void _SetDisabledForAllControl(const bool disabled);
+
   // Member data
 
   // Input arrays to NAM
@@ -287,4 +291,6 @@ class NeuralAmpModeler final : public iplug::Plugin
   std::unordered_map<std::string, double> mNAMParams = {{"Input", 0.0}, {"Output", 0.0}};
 
   NAMSender mInputSender, mOutputSender;
+
+  bool mNamActive{true};
 };

NeuralAmpModeler/NeuralAmpModelerControls.h

@@ -302,7 +302,9 @@ class NAMFileBrowserControl : public IDirBrowseControlBase
     auto clearFileFunc = [&](IControl* pCaller) {
       pCaller->GetDelegate()->SendArbitraryMsgFromUI(mClearMsgTag);
       mFileNameControl->SetLabelAndTooltip(mDefaultLabelStr.Get());
-      pCaller->GetUI()->GetControlWithTag(kCtrlTagOutNorm)->SetDisabled(false);
+
+      const bool namActive = pCaller->GetUI()->GetControlWithParamIdx(kNamToggle)->GetValue();
+      pCaller->GetUI()->GetControlWithTag(kCtrlTagOutNorm)->SetDisabled(!namActive);
     };
 
     auto chooseFileFunc = [&, loadFileFunc](IControl* pCaller) {
@@ -699,3 +701,26 @@ class NAMSettingsPageControl : public IContainerBaseWithNamedChildren
     IText mText;
   };
 };
+
+class NAMTitleToggleControl : public ITextToggleControl
+{
+public:
+  NAMTitleToggleControl(const IRECT& bounds, int paramIdx, const IText& text)
+  : ITextToggleControl(bounds, paramIdx, "NEURAL AMP MODELER", "NEURAL AMP MODELER", text)
+  {
+  }
+
+  void Draw(IGraphics& g) override
+  {
+    if (GetValue())
+    {
+      SetText(mText.WithFGColor(COLOR_WHITE));
+    }
+    else
+    {
+      SetText(mText.WithFGColor(COLOR_BLACK));
+    }
+
+    ITextToggleControl::Draw(g);
+  }
+};