Move mirror options to a submenu & only list hardware

Dewb · Sep 17, 2023 · 1c080e5 · 1c080e5
1 parent c5f89a2
commit 1c080e5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/src/common/core/GridConnection/GridConnection.hpp b/src/common/core/GridConnection/GridConnection.hpp
@@ -15,6 +15,7 @@ struct Grid
     virtual void updateQuadrant(int x, int y, uint8_t* leds) = 0;
     virtual void updateRing(int n, uint8_t leds[64]) = 0;
     virtual void clearAll() = 0;
+    virtual bool isHardware() = 0;
 };
 
 struct GridConsumer

diff --git a/src/common/core/GridConnection/GridConnectionMenu.cpp b/src/common/core/GridConnection/GridConnectionMenu.cpp
@@ -41,7 +41,7 @@ void menuUserReacquireGrid(GridConsumer* consumer, std::string lastDeviceId, Act
     }
 }
 
-void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, ActionQueue* actionQueue)
+void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, ActionQueue* actionQueue, bool hardwareOnly)
 {
     std::string currentConnectedDeviceId = consumer->gridGetCurrentDeviceId();
     std::string lastConnectedDeviceId = consumer->gridGetLastDeviceId(false);
@@ -70,6 +70,11 @@ void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, Action
     bool preferredDeviceFound = false;
     for (Grid* grid : GridConnectionManager::get().getGrids())
     {
+        if (hardwareOnly && !grid->isHardware())
+        {
+            continue;
+        }
+
         auto connectItem = new NewConnectGridItem();
         connectItem->text = "└ " + grid->getDevice().type + " (" + grid->getDevice().id + ") ";
 
@@ -96,7 +101,8 @@ void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, Action
 
     if (deviceCount == 0)
     {
-        menu->addChild(construct<MenuLabel>(&MenuLabel::text, "  (no physical or virtual devices found)"));
+        std::string message = hardwareOnly ? "no hardware devices found" : "no hardware or virtual devices found";
+        menu->addChild(construct<MenuLabel>(&MenuLabel::text, "  (" + message + ")"));
     }
 
     if (currentConnectedDeviceId == "" && lastConnectedDeviceId != "")

diff --git a/src/common/core/GridConnection/GridConnectionMenu.hpp b/src/common/core/GridConnection/GridConnectionMenu.hpp
@@ -4,4 +4,4 @@
 #include "GridConnection.hpp"
 #include "ActionQueue.hpp"
 
-void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, ActionQueue* queue);
+void appendDeviceConnectionMenu(rack::Menu* menu, GridConsumer* consumer, ActionQueue* queue, bool hardwareOnly = false);
diff --git a/src/common/core/GridConnection/SerialOscGrid.hpp b/src/common/core/GridConnection/SerialOscGrid.hpp
@@ -13,4 +13,5 @@ struct SerialOscGrid : Grid
     void updateQuadrant(int x, int y, uint8_t* leds) override;
     void updateRing(int n, uint8_t leds[64]) override;
     void clearAll() override;
+    bool isHardware() override { return true; }
 };
diff --git a/src/virtualgrid/VirtualGridModule.hpp b/src/virtualgrid/VirtualGridModule.hpp
@@ -31,6 +31,7 @@ struct VirtualGridModule : rack::Module, Grid
     void updateQuadrant(int x_offset, int y_offset, uint8_t* leds) override;
     void updateRing(int n, uint8_t leds[64]) override {};
     void clearAll() override;
+    bool isHardware() override { return false; }
 
     GridConsumer* mirrorModeConsumer;
     ActionQueue audioThreadActions;

diff --git a/src/virtualgrid/VirtualGridWidget.cpp b/src/virtualgrid/VirtualGridWidget.cpp
@@ -214,12 +214,16 @@ void VirtualGridWidget::appendContextMenu(Menu * menu)
         screenshotModulePNG(this, "grid-screenshot.png");
     }));
 
-    appendDeviceConnectionMenu(menu, grid->mirrorModeConsumer, &grid->audioThreadActions);
+    menu->addChild(createSubmenuItem("Mirror hardware grid", "", [=](Menu *childMenu) {
+        appendDeviceConnectionMenu(childMenu, grid->mirrorModeConsumer, &grid->audioThreadActions, true);
+    }));
 
     menu->addChild(new MenuSeparator());
     menu->addChild(createIndexPtrSubmenuItem("Theme", { "Red", "Orange", "Yellow", "White" }, &grid->theme));
     menu->addChild(createIndexSubmenuItem("Protocol", {"40h", "Series", "Mext (varibright)"}, 
-        [=]() { return grid ? grid->device.protocol : 0; },
+        [=]() {
+            return grid ? grid->device.protocol : 0;
+        },
         [=](size_t index) {
             setProtocol(grid, static_cast<MonomeProtocol>(index));
         }));