Using Maschine 2 knobs force pause

pongasoft · Jul 16, 2018 · ac4d32a · ac4d32a
1 parent ed31f52
commit ac4d32a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,8 +8,6 @@ set(SMTG_CREATE_VST3_LINK OFF)
 # Platform Detection
 #-------------------------------------------------------------------------------
 
-# TODO Fix broken link created to VST3
-
 if(APPLE)
     set(MAC TRUE)
 elseif(WIN32)

diff --git a/src/cpp/VAC6Processor.cpp b/src/cpp/VAC6Processor.cpp
@@ -233,6 +233,18 @@ tresult VAC6Processor::genericProcessInputs(ProcessData &data)
   bool isNewLiveView = false;
   bool isNewPause = false;
 
+  // some DAW like Maschine exposes the controls which then bypasses pause => force into pause
+  if(fPreviousState.fLCDInputX != fState.fLCDInputX ||
+     fPreviousState.fLCDHistoryOffset != fState.fLCDHistoryOffset)
+  {
+    if(fState.fLCDLiveView)
+    {
+      fState.updateLCDLiveView(data, false);
+    }
+  }
+
+  // TODO: in Maschine 2, updating vst parameters from processing does not change the knob in the Maschine 2 interface
+
   // live view/pause has changed
   if(fPreviousState.fLCDLiveView != fState.fLCDLiveView)
   {
@@ -289,7 +301,7 @@ tresult VAC6Processor::genericProcessInputs(ProcessData &data)
     fRightChannelProcessor->setDirty();
   }
 
-  // Scrollbar has been moved (should happen only in pause mode)
+  // Scrollbar has been moved
   if(fPreviousState.fLCDHistoryOffset != fState.fLCDHistoryOffset)
   {
     fZoomWindow->setWindowOffset(fState.fLCDHistoryOffset);
@@ -628,5 +640,15 @@ void VAC6Processor::State::updateLCDHistoryOffset(ProcessData &iData, double iLC
   addOutputParameterChange(iData, EVAC6ParamID::kLCDHistoryOffset, LCDHistoryOffsetParamConverter::normalize(fLCDHistoryOffset));
 
 }
+
+///////////////////////////////////////////
+// VAC6Processor::State::updateLCDLiveView
+///////////////////////////////////////////
+void VAC6Processor::State::updateLCDLiveView(ProcessData &iData, bool iLCDLiveView)
+{
+  fLCDLiveView = iLCDLiveView;
+  addOutputParameterChange(iData, EVAC6ParamID::kLCDLiveView, BooleanParamConverter::normalize(fLCDLiveView));
+}
+
 }
 }
diff --git a/src/cpp/VAC6Processor.h b/src/cpp/VAC6Processor.h
@@ -108,6 +108,7 @@ class VAC6Processor : public AudioEffect, ITimerCallback
 
     void updateLCDInputX(ProcessData& iData, int iLCDInputX);
     void updateLCDHistoryOffset(ProcessData& iData, double iLCDHistoryOffset);
+    void updateLCDLiveView(ProcessData& iData, bool iLCDLiveView);
   };
 
   bool fMaxLevelResetRequested;

diff --git a/src/cpp/controller/LCDScrollbarView.cpp b/src/cpp/controller/LCDScrollbarView.cpp
@@ -69,7 +69,6 @@ CMouseEventResult LCDScrollbarView::onMouseDown(CPoint &where, const CButtonStat
 
   if(fLCDLiveViewParameter->getValue())
   {
-    DLOG_F(INFO, "LCDScrollbarView::onMouseDown() => stopping");
     fLCDLiveViewParameter->setValue(false);
   }