factor out ControlElement base class without UI dependency

drlight-code · Feb 28, 2020 · ae8c279 · ae8c279
1 parent 9e09c46
commit ae8c279
Show file tree

Hide file tree

Showing 15 changed files with 233 additions and 129 deletions.
diff --git a/Source/ControlContainer.cpp b/Source/ControlContainer.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "LayoutHints.h"
-#include "ControlElement.h"
+#include "ControlElementUI.h"
 
 #include "ControlContainer.h"
 
@@ -36,7 +36,7 @@ resized()
     }
 }
 
-std::list<ControlElementUniq> &
+std::list<ControlElementUIUniq> &
 ControlContainer::
 getElementList()
 {

diff --git a/Source/ControlContainer.h b/Source/ControlContainer.h
@@ -24,22 +24,21 @@
 
 #include <JuceHeader.h>
 
-class ControlElement;
-using ControlElementUniq = std::unique_ptr<ControlElement>;
+class ControlElementUI;
+using ControlElementUIUniq = std::unique_ptr<ControlElementUI>;
 
 class ControlContainer :
     public Component
 {
 public:
     void resized() override;
 
-    std::list<ControlElementUniq> & getElementList();
+    std::list<ControlElementUIUniq> & getElementList();
 
     OSCSender & getOSCSender();
 
 private:
-    std::list<ControlElementUniq> listControlElements;
+    std::list<ControlElementUIUniq> listControlElements;
     OSCSender oscSender;
 };
-
 using ControlContainerUniq = std::unique_ptr<ControlContainer>;
diff --git a/Source/ControlElement.cpp b/Source/ControlElement.cpp
@@ -18,8 +18,6 @@
 
 */
 
-#include "LayoutHints.h"
-
 #include "ControlElement.h"
 
 ControlElement::
@@ -29,76 +27,4 @@ ControlElement
     oscSender(oscSender),
     createInfo(createInfo)
 {
-    message = createInfo.message;
-    messageMute = createInfo.messageMute;
-
-    buttonMute.reset (new TextButton ("buttonMute"));
-    buttonMute->setButtonText("m");
-    buttonMute->setColour(TextButton::buttonOnColourId,
-                          Colours::crimson);
-    buttonMute->setClickingTogglesState(true);
-    buttonMute->setPaintingIsUnclipped(true);
-    buttonMute->getToggleStateValue().addListener(this);
-    addAndMakeVisible(buttonMute.get());
-
-    sendValue.addListener(this);
-}
-
-void
-ControlElement::
-resized()
-{
-    auto area = getLocalBounds();
-
-    auto gap = LayoutHints::sizeGap;
-    auto buttonSize = LayoutHints::heightRow - 2*gap;
-
-    area.removeFromRight(gap);
-    area.removeFromTop(gap);
-    area.setHeight(buttonSize);
-
-    buttonMute->setBounds(area.removeFromRight(buttonSize));
-}
-
-void
-ControlElement::
-registerSendValue()
-{
-    sendValue.removeListener(this);
-    sendValue.referTo
-        (getSpecificSendValue());
-    sendValue.addListener(this);
-}
-
-void
-ControlElement::
-valueChanged
-(Value & value)
-{
-    if(value == buttonMute->getToggleStateValue()) {
-        auto toggleState = buttonMute->getToggleState();
-        if(messageMute != "") {
-            auto oscMessage = OSCMessage(String(messageMute),
-                int(toggleState));
-            oscSender.send(oscMessage);
-        }
-
-        if(!toggleState) {
-            send();
-        }
-    }
-    else if(value.refersToSameSourceAs(sendValue)) {
-        send();
-    }
-}
-
-void
-ControlElement::
-send()
-{
-    if (!buttonMute->getToggleState()) {
-        auto value = sendValue.getValue();
-        auto oscMessage = OSCMessage(String(message), float(value));
-        oscSender.send(oscMessage);
-    }
 }
diff --git a/Source/ControlElement.h b/Source/ControlElement.h
@@ -24,9 +24,7 @@
 
 #include <JuceHeader.h>
 
-class ControlElement :
-    public Component,
-    public Value::Listener
+class ControlElement
 {
 public:
     struct CreateInfo {
@@ -44,25 +42,9 @@ class ControlElement :
     (const CreateInfo & info,
      OSCSender & oscSender);
 
-    virtual int getNumberOfRows() const = 0;
-    void resized() override;
-
-    void registerSendValue();
-
-    void valueChanged(Value & value) override;
-
-    void send();
+    virtual void send() = 0;
 
 protected:
-    virtual Value & getSpecificSendValue() = 0;
     OSCSender & oscSender;
-
-private:
     CreateInfo createInfo;
-    std::unique_ptr<TextButton> buttonMute;
-
-    String message;
-    String messageMute;
-
-    Value sendValue;
 };
diff --git a/Source/ControlElementFactory.cpp b/Source/ControlElementFactory.cpp
@@ -22,6 +22,7 @@
 
 #include "PluginProcessor.h"
 
+#include "ControlElementUI.h"
 #include "ControlElementKnob.h"
 #include "ControlElementFactory.h"
 
@@ -34,9 +35,9 @@ ControlElementFactory
 {
 }
 
-std::unique_ptr<ControlElement>
+std::unique_ptr<ControlElementUI>
 ControlElementFactory::
-createControlElement
+createControlElementUI
 (YAML::Node configElement, YAML::Node configInterface)
 {
     ControlElement::CreateInfo info;
@@ -50,7 +51,7 @@ createControlElement
             showNames.IsScalar() ? showNames.as<bool>() : false;
     }
 
-    std::unique_ptr<ControlElement> product;
+    std::unique_ptr<ControlElementUI> product;
     if(type == "knob") {
 
         auto range = configElement["range"];

diff --git a/Source/ControlElementFactory.h b/Source/ControlElementFactory.h
@@ -35,8 +35,8 @@ class ControlElementFactory  {
     (OSCSender & oscSender,
      OscsendvstAudioProcessor & processor);
 
-    std::unique_ptr<ControlElement>
-    createControlElement
+    std::unique_ptr<ControlElementUI>
+    createControlElementUI
     (YAML::Node configElement,
      YAML::Node configInterface);
 

diff --git a/Source/ControlElementKnob.cpp b/Source/ControlElementKnob.cpp
@@ -28,7 +28,7 @@ ControlElementKnob::
 ControlElementKnob
 (const CreateInfo & createInfo,
  OSCSender & oscSender) :
-    ControlElement(createInfo, oscSender)
+    ControlElementUI(createInfo, oscSender)
 {
     knob.reset (new Slider("knob"));
     knob->setSliderStyle (Slider::RotaryVerticalDrag);
@@ -72,7 +72,7 @@ void
 ControlElementKnob::
 resized()
 {
-    ControlElement::resized();
+    ControlElementUI::resized();
 
     auto area = getLocalBounds();
     auto areaKnob = area.removeFromLeft(LayoutHints::heightRow);

diff --git a/Source/ControlElementKnob.h b/Source/ControlElementKnob.h
@@ -22,11 +22,11 @@
 
 #include <utility>
 
-#include "ControlElement.h"
+#include "ControlElementUI.h"
 #include "ControlElementKnob.h"
 
 class ControlElementKnob :
-    public ControlElement
+    public ControlElementUI
 {
 public:
     ControlElementKnob

diff --git a/Source/ControlElementUI.cpp b/Source/ControlElementUI.cpp
@@ -0,0 +1,101 @@
+/*
+
+  oscsend-vst - An audio plugin that speaks OSC.
+  Copyright (C) 2020 Patric Schmitz
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "LayoutHints.h"
+
+#include "ControlElementUI.h"
+
+ControlElementUI::
+ControlElementUI
+(const CreateInfo & info,
+    OSCSender & oscSender) :
+    ControlElement(info, oscSender)
+{
+    buttonMute.reset (new TextButton ("buttonMute"));
+    buttonMute->setButtonText("m");
+    buttonMute->setColour(TextButton::buttonOnColourId,
+        Colours::crimson);
+    buttonMute->setClickingTogglesState(true);
+    buttonMute->setPaintingIsUnclipped(true);
+    buttonMute->getToggleStateValue().addListener(this);
+    addAndMakeVisible(buttonMute.get());
+
+    sendValue.addListener(this);
+}
+
+void
+ControlElementUI::
+resized()
+{
+    auto area = getLocalBounds();
+
+    auto gap = LayoutHints::sizeGap;
+    auto buttonSize = LayoutHints::heightRow - 2*gap;
+
+    area.removeFromRight(gap);
+    area.removeFromTop(gap);
+    area.setHeight(buttonSize);
+
+    buttonMute->setBounds(area.removeFromRight(buttonSize));
+}
+
+void
+ControlElementUI::
+registerSendValue()
+{
+    sendValue.removeListener(this);
+    sendValue.referTo
+        (getSpecificSendValue());
+    sendValue.addListener(this);
+}
+
+void
+ControlElementUI::
+valueChanged
+(Value & value)
+{
+    if(value == buttonMute->getToggleStateValue()) {
+        auto toggleState = buttonMute->getToggleState();
+        if(createInfo.messageMute != "") {
+            auto oscMessage =
+                OSCMessage(String(createInfo.messageMute), int(toggleState));
+            oscSender.send(oscMessage);
+        }
+
+        if(!toggleState) {
+            send();
+        }
+    }
+    else if(value.refersToSameSourceAs(sendValue)) {
+        send();
+    }
+}
+
+void
+ControlElementUI::
+send()
+{
+    if (!buttonMute->getToggleState()) {
+        auto value = sendValue.getValue();
+        auto oscMessage =
+            OSCMessage(String(createInfo.message), float(value));
+        oscSender.send(oscMessage);
+    }
+}
diff --git a/Source/ControlElementUI.h b/Source/ControlElementUI.h
@@ -0,0 +1,53 @@
+/*
+
+  oscsend-vst - An audio plugin that speaks OSC.
+  Copyright (C) 2020 Patric Schmitz
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#pragma once
+
+#include "ControlElement.h"
+
+class ControlElementUI :
+    public ControlElement,
+    public Component,
+    public Value::Listener
+{
+public:
+    ControlElementUI
+    (const CreateInfo & info,
+        OSCSender & oscSender);
+
+    virtual int getNumberOfRows() const = 0;
+    void resized() override;
+
+    void registerSendValue();
+
+    void valueChanged(Value & value) override;
+
+    void send() override;
+
+protected:
+
+    virtual Value & getSpecificSendValue() = 0;
+
+private:
+
+    std::unique_ptr<TextButton> buttonMute;
+    Value sendValue;
+};
+using ControlElementUIUniq = std::unique_ptr<ControlElementUI>;