Merge pull request #3634 from Be-ing/controller_visitors

remove ControllerVisitor
mixxxdj · Feb 15, 2021 · cf62c81 · cf62c81
2 parents 613d8f6 + 0a19f93
commit cf62c81
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 97 deletions.
diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
@@ -53,12 +53,6 @@ class BulkController : public Controller {
     void visit(const LegacyMidiControllerMapping* mapping) override;
     void visit(const LegacyHidControllerMapping* mapping) override;
 
-    void accept(ControllerVisitor* visitor) override {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
     bool isMappable() const override {
         return m_mapping.isMappable();
     }

diff --git a/src/controllers/controller.h b/src/controllers/controller.h
@@ -5,7 +5,6 @@
 
 #include "controllers/controllermappinginfo.h"
 #include "controllers/controllermappingvisitor.h"
-#include "controllers/controllervisitor.h"
 #include "controllers/legacycontrollermapping.h"
 #include "controllers/legacycontrollermappingfilehandler.h"
 #include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
@@ -38,8 +37,6 @@ class Controller : public QObject, ConstLegacyControllerMappingVisitor {
         mapping.accept(this);
     }
 
-    virtual void accept(ControllerVisitor* visitor) = 0;
-
     // Returns a clone of the Controller's loaded mapping.
     virtual LegacyControllerMappingPointer getMapping() const = 0;
 

diff --git a/src/controllers/controllervisitor.h b/src/controllers/controllervisitor.h
diff --git a/src/controllers/dlgcontrollerlearning.cpp b/src/controllers/dlgcontrollerlearning.cpp
@@ -19,7 +19,6 @@ DlgControllerLearning::DlgControllerLearning(QWidget* parent,
         Controller* controller)
         : QDialog(parent),
           m_pController(controller),
-          m_pMidiController(nullptr),
           m_controlPickerMenu(this),
           m_messagesLearned(false) {
     qRegisterMetaType<MidiInputMappings>("MidiInputMappings");
@@ -206,9 +205,46 @@ void DlgControllerLearning::slotChooseControlPressed() {
 void DlgControllerLearning::startListening() {
     // Start listening as soon as we're on this page -- that way advanced
     // users don't have to specifically click the "Learn" button.
-    // Get the underlying type of the Controller. This will call
-    // one of the visit() methods below immediately.
-    m_pController->accept(this);
+    // Disconnect everything in both directions so we don't end up with duplicate connections
+    // after pressing the "Learn Another" button
+    MidiController* pMidiController = qobject_cast<MidiController*>(m_pController);
+    VERIFY_OR_DEBUG_ASSERT(pMidiController) {
+        // DlgControllerLearning should have only been created by DlgController if
+        // the Controller was a MidiController.
+        qWarning() << "Only MIDI controllers are supported by the learning wizard.";
+        return;
+    }
+    pMidiController->disconnect(this);
+    this->disconnect(pMidiController);
+
+    connect(pMidiController,
+            &MidiController::messageReceived,
+            this,
+            &DlgControllerLearning::slotMessageReceived);
+
+    connect(this,
+            &DlgControllerLearning::learnTemporaryInputMappings,
+            pMidiController,
+            &MidiController::learnTemporaryInputMappings);
+    connect(this,
+            &DlgControllerLearning::clearTemporaryInputMappings,
+            pMidiController,
+            &MidiController::clearTemporaryInputMappings);
+
+    connect(this,
+            &DlgControllerLearning::commitTemporaryInputMappings,
+            pMidiController,
+            &MidiController::commitTemporaryInputMappings);
+    connect(this,
+            &DlgControllerLearning::startLearning,
+            pMidiController,
+            &MidiController::startLearning);
+    connect(this,
+            &DlgControllerLearning::stopLearning,
+            pMidiController,
+            &MidiController::stopLearning);
+
+    emit startLearning();
     emit listenForClicks();
 }
 
@@ -395,54 +431,6 @@ void DlgControllerLearning::commitMapping() {
     emit inputMappingsLearned(m_mappings);
 }
 
-void DlgControllerLearning::visit(MidiController* pMidiController) {
-    // Disconnect everything in both directions so we don't end up with duplicate connections
-    // after pressing the "Learn Another" button
-    pMidiController->disconnect(this);
-    this->disconnect(pMidiController);
-
-    m_pMidiController = pMidiController;
-
-    connect(m_pMidiController,
-            &MidiController::messageReceived,
-            this,
-            &DlgControllerLearning::slotMessageReceived);
-
-    connect(this,
-            &DlgControllerLearning::learnTemporaryInputMappings,
-            m_pMidiController,
-            &MidiController::learnTemporaryInputMappings);
-    connect(this,
-            &DlgControllerLearning::clearTemporaryInputMappings,
-            m_pMidiController,
-            &MidiController::clearTemporaryInputMappings);
-
-    connect(this,
-            &DlgControllerLearning::commitTemporaryInputMappings,
-            m_pMidiController,
-            &MidiController::commitTemporaryInputMappings);
-    connect(this,
-            &DlgControllerLearning::startLearning,
-            m_pMidiController,
-            &MidiController::startLearning);
-    connect(this,
-            &DlgControllerLearning::stopLearning,
-            m_pMidiController,
-            &MidiController::stopLearning);
-
-    emit startLearning();
-}
-
-void DlgControllerLearning::visit(HidController* pHidController) {
-    qWarning() << "ERROR: DlgControllerLearning does not support HID devices.";
-    Q_UNUSED(pHidController);
-}
-
-void DlgControllerLearning::visit(BulkController* pBulkController) {
-    qWarning() << "ERROR: DlgControllerLearning does not support Bulk devices.";
-    Q_UNUSED(pBulkController);
-}
-
 DlgControllerLearning::~DlgControllerLearning() {
     // If the user hit done, we should save any pending mappings.
     if (m_messagesLearned) {

diff --git a/src/controllers/dlgcontrollerlearning.h b/src/controllers/dlgcontrollerlearning.h
@@ -14,7 +14,6 @@
 #include "controllers/bulk/bulkcontroller.h"
 #include "controllers/midi/midimessage.h"
 #include "controllers/controller.h"
-#include "controllers/controllervisitor.h"
 #include "preferences/usersettings.h"
 
 class LegacyControllerMapping;
@@ -23,18 +22,13 @@ class LegacyControllerMapping;
 
 /// The controller mapping learning wizard
 class DlgControllerLearning : public QDialog,
-                              public ControllerVisitor,
                               public Ui::DlgControllerLearning {
     Q_OBJECT
 
   public:
     DlgControllerLearning(QWidget *parent, Controller *controller);
     virtual ~DlgControllerLearning();
 
-    void visit(MidiController* pController);
-    void visit(HidController* pController);
-    void visit(BulkController* pController);
-
   signals:
     void learnTemporaryInputMappings(const MidiInputMappings& mappings);
     void clearTemporaryInputMappings();
@@ -83,7 +77,6 @@ class DlgControllerLearning : public QDialog,
     void populateComboBox();
 
     Controller* m_pController;
-    MidiController* m_pMidiController;
     ControlPickerMenu m_controlPickerMenu;
     ConfigKey m_currentControl;
     bool m_messagesLearned;

diff --git a/src/controllers/hid/hidcontroller.h b/src/controllers/hid/hidcontroller.h
@@ -25,12 +25,6 @@ class HidController final : public Controller {
     void visit(const LegacyMidiControllerMapping* mapping) override;
     void visit(const LegacyHidControllerMapping* mapping) override;
 
-    void accept(ControllerVisitor* visitor) override {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
     bool isMappable() const override {
         return m_mapping.isMappable();
     }

diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
@@ -34,12 +34,6 @@ class MidiController : public Controller {
     void visit(const LegacyMidiControllerMapping* mapping) override;
     void visit(const LegacyHidControllerMapping* mapping) override;
 
-    void accept(ControllerVisitor* visitor) override {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
     bool isMappable() const override {
         return m_mapping.isMappable();
     }

diff --git a/src/test/controller_mapping_validation_test.h b/src/test/controller_mapping_validation_test.h
@@ -51,11 +51,6 @@ class FakeController : public Controller {
         m_hidMapping = *mapping;
     }
 
-    void accept(ControllerVisitor* visitor) override {
-        // Do nothing since we aren't a normal controller.
-        Q_UNUSED(visitor);
-    }
-
     bool isMappable() const override;
 
     bool matchMapping(const MappingInfo& mapping) override {