Move prefix/port messages from on-detection to on-connection

Dewb · Sep 28, 2024 · 47ade47 · 47ade47
1 parent 16827b0
commit 47ade47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/serialosc/SerialOsc.cpp b/lib/serialosc/SerialOsc.cpp
@@ -413,9 +413,6 @@ void SerialOsc::ProcessMessage(const osc::ReceivedMessage& m, const IpEndpointNa
             // wait until after size message recieved -MD
             // listener->deviceFound(device);
             sendDeviceInfoMessage(device->port);
-
-            sendDevicePrefixMessage(port);
-            sendDevicePortMessage(port);
         }
         else if (address == "/serialosc/remove")
         {

diff --git a/src/common/core/GridConnection/GridConnection.cpp b/src/common/core/GridConnection/GridConnection.cpp
@@ -1,4 +1,5 @@
 #include "GridConnection.hpp"
+#include "SerialOscInterface.hpp"
 
 void GridConnectionManager::registerGrid(Grid* grid)
 {
@@ -76,6 +77,15 @@ void GridConnectionManager::connect(Grid* grid, IGridConsumer* consumer)
     consumerToGridMap[consumer] = grid;
     idToConsumerMap[grid->getDevice().id] = consumer;
     consumer->gridConnected(grid);
+
+    // If serialosc is managing the grid (e.g. it's a hardware grid), inform serialosc about new grid owner
+    auto port = grid->getDevice().port;
+    auto so = SerialOscInterface::get();
+    if (port > 0 && so != nullptr && so->driver != nullptr)
+    {
+        so->driver->sendDevicePrefixMessage(port);
+        so->driver->sendDevicePortMessage(port);
+    }
 }
 
 bool GridConnectionManager::isConnected(IGridConsumer* consumer)