engine: move local-tree port options out of the core application settings

Per review on #2116: core ApplicationSettings should not grow
device-specific options; plug-ins parse their own CLI flags like
score-plugin-js / score-plugin-jit do.

- Revert the ApplicationSettings additions.
- Parse --local-osc-port / --local-ws-port (and the
  SCORE_LOCAL_OSC_PORT / SCORE_LOCAL_WS_PORT fallbacks) in
  Engine::ApplicationPlugin, storing the results in
  LocalProtocolFactory::defaultOscPort / defaultWsPort.
- LocalProtocolFactory::static_defaultSettings() and the per-document
  local device defaults read those, so the Local device settings dialog
  shows them as editable defaults; ports remain changeable per-device
  through its existing OSC / WebSocket spinboxes.

Defaults stay 6666 / 9999.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: 2 people

src/lib/core/application/ApplicationSettings.cpp

@@ -86,24 +86,6 @@ void ApplicationSettings::parse(QStringList cargs, int& argc, char** argv)
       "file", "");
   parser.addOption(uiOptDebug);
 
-  QCommandLineOption localOscPortOpt(
-      "local-osc-port",
-      QCoreApplication::translate(
-          "main",
-          "Port for score's local OSC control tree (default 6666). Lets several "
-          "instances run at once. Also settable via $SCORE_LOCAL_OSC_PORT."),
-      "port");
-  parser.addOption(localOscPortOpt);
-
-  QCommandLineOption localWsPortOpt(
-      "local-ws-port",
-      QCoreApplication::translate(
-          "main",
-          "Port for score's local WebSocket control tree (default 9999). Also "
-          "settable via $SCORE_LOCAL_WS_PORT."),
-      "port");
-  parser.addOption(localWsPortOpt);
-
 #if defined(__APPLE__)
   // Bogus macOS gatekeeper BS:
   // https://stackoverflow.com/questions/55562155/qt-application-for-mac-not-being-launched
@@ -184,17 +166,6 @@ void ApplicationSettings::parse(QStringList cargs, int& argc, char** argv)
   if(parser.isSet(waitLoadOpt))
     waitAfterLoad = parser.value(waitLoadOpt).toInt();
 
-  // Local device tree ports: CLI flag wins, else $SCORE_LOCAL_*_PORT, else default.
-  if(parser.isSet(localOscPortOpt))
-    localTreeOscPort = parser.value(localOscPortOpt).toInt();
-  else if(qEnvironmentVariableIsSet("SCORE_LOCAL_OSC_PORT"))
-    localTreeOscPort = qEnvironmentVariableIntValue("SCORE_LOCAL_OSC_PORT");
-
-  if(parser.isSet(localWsPortOpt))
-    localTreeWebsocketPort = parser.value(localWsPortOpt).toInt();
-  else if(qEnvironmentVariableIsSet("SCORE_LOCAL_WS_PORT"))
-    localTreeWebsocketPort = qEnvironmentVariableIntValue("SCORE_LOCAL_WS_PORT");
-
   if(!args.empty() && QFile::exists(args[0]))
   {
     loadList.push_back(args[0]);

src/lib/core/application/ApplicationSettings.hpp

@@ -51,12 +51,6 @@ struct SCORE_LIB_BASE_EXPORT ApplicationSettings
   //! UI event processing rate in ms (used for plug-in gui updates, etc)
   int uiEventRate = 64;
 
-  //! OSC port for score's local device tree. Lets multiple instances coexist.
-  int localTreeOscPort = 6666;
-
-  //! WebSocket port for score's local device tree.
-  int localTreeWebsocketPort = 9999;
-
   //! Parse the arguments.
   void parse(QStringList args, int& argc, char** argv);
 };

src/plugins/score-plugin-engine/Engine/ApplicationPlugin.cpp

@@ -12,6 +12,7 @@
 #include <Scenario/Settings/ScenarioSettingsModel.hpp>
 
 #include <Execution/DocumentPlugin.hpp>
+#include <LocalTree/Device/LocalProtocolFactory.hpp>
 #include <LocalTree/LocalTreeDocumentPlugin.hpp>
 
 #include <score/actions/ActionManager.hpp>
@@ -29,6 +30,7 @@
 
 #include <ossia-qt/invoke.hpp>
 
+#include <QCommandLineParser>
 #include <QLabel>
 #include <QMainWindow>
 #include <QTabWidget>
@@ -50,6 +52,37 @@ ApplicationPlugin::ApplicationPlugin(const score::GUIApplicationContext& ctx)
             .applicationPlugin<Process::ApplicationPlugin>();
     m_playActions.setupContextMenu(ctrl.layerContextMenuRegistrar());
   }
+
+  {
+    // Command-line options for the local device tree default ports.
+    // CLI flag wins, then $SCORE_LOCAL_{OSC,WS}_PORT, then 6666 / 9999.
+    QCommandLineParser parser;
+
+    QCommandLineOption osc_port_opt(
+        "local-osc-port",
+        QCoreApplication::translate("engine", "Local device tree OSC port"), "port");
+    parser.addOption(osc_port_opt);
+    QCommandLineOption ws_port_opt(
+        "local-ws-port",
+        QCoreApplication::translate("engine", "Local device tree WebSocket port"),
+        "port");
+    parser.addOption(ws_port_opt);
+
+    parser.parse(ctx.applicationSettings.arguments);
+
+    using Protocols::LocalProtocolFactory;
+    if(parser.isSet(osc_port_opt))
+      LocalProtocolFactory::defaultOscPort = parser.value(osc_port_opt).toInt();
+    else if(qEnvironmentVariableIsSet("SCORE_LOCAL_OSC_PORT"))
+      LocalProtocolFactory::defaultOscPort
+          = qEnvironmentVariableIntValue("SCORE_LOCAL_OSC_PORT");
+
+    if(parser.isSet(ws_port_opt))
+      LocalProtocolFactory::defaultWsPort = parser.value(ws_port_opt).toInt();
+    else if(qEnvironmentVariableIsSet("SCORE_LOCAL_WS_PORT"))
+      LocalProtocolFactory::defaultWsPort
+          = qEnvironmentVariableIntValue("SCORE_LOCAL_WS_PORT");
+  }
 }
 
 ApplicationPlugin::~ApplicationPlugin()

src/plugins/score-plugin-engine/LocalTree/Device/LocalProtocolFactory.cpp

@@ -10,10 +10,6 @@
 #include <LocalTree/Device/LocalSpecificSettings.hpp>
 #include <LocalTree/LocalTreeDocumentPlugin.hpp>
 
-#include <score/application/ApplicationContext.hpp>
-
-#include <core/application/ApplicationSettings.hpp>
-
 #include <QDebug>
 #include <QObject>
 #include <QUrl>
@@ -27,6 +23,9 @@ struct VisitorVariant;
 
 namespace Protocols
 {
+int LocalProtocolFactory::defaultOscPort = 6666;
+int LocalProtocolFactory::defaultWsPort = 9999;
+
 QString LocalProtocolFactory::prettyName() const noexcept
 {
   return QObject::tr("Local");
@@ -58,17 +57,17 @@ Device::DeviceInterface* LocalProtocolFactory::makeDevice(
 
 const Device::DeviceSettings& LocalProtocolFactory::static_defaultSettings()
 {
-  static const Device::DeviceSettings settings = [&]() {
+  static Device::DeviceSettings settings = [&]() {
     Device::DeviceSettings s;
     s.protocol = static_concreteKey(); // Todo check for un-set protocol.
     s.name = "score";
-    LocalSpecificSettings specif;
-    specif.oscPort = score::AppContext().applicationSettings.localTreeOscPort;
-    specif.wsPort = score::AppContext().applicationSettings.localTreeWebsocketPort;
-    s.deviceSpecificSettings = QVariant::fromValue(specif);
     return s;
   }();
 
+  LocalSpecificSettings specif;
+  specif.oscPort = defaultOscPort;
+  specif.wsPort = defaultWsPort;
+  settings.deviceSpecificSettings = QVariant::fromValue(specif);
   return settings;
 }
 

src/plugins/score-plugin-engine/LocalTree/Device/LocalProtocolFactory.hpp

@@ -24,6 +24,10 @@ class LocalProtocolFactory final : public DefaultProtocolFactory
 public:
   static const Device::DeviceSettings& static_defaultSettings();
 
+  //! Default ports for new local devices; set at startup from CLI / environment.
+  static int defaultOscPort;
+  static int defaultWsPort;
+
 private:
   // Implement with OSSIA::Device
   QString prettyName() const noexcept override;

src/plugins/score-plugin-engine/LocalTree/LocalTreeDocumentPlugin.cpp

@@ -12,8 +12,6 @@
 #include <LocalTree/IntervalComponent.hpp>
 
 #include <score/application/GUIApplicationContext.hpp>
-
-#include <core/application/ApplicationSettings.hpp>
 #include <score/tools/Bind.hpp>
 #include <score/tools/IdentifierGeneration.hpp>
 
@@ -31,8 +29,8 @@ Device::DeviceSettings defaultSettings(const score::DocumentContext& ctx)
   s.protocol = Protocols::LocalProtocolFactory::static_concreteKey();
   s.name = QString("score (%1)").arg(ctx.document.metadata().documentName());
   Protocols::LocalSpecificSettings specif;
-  specif.oscPort = ctx.app.applicationSettings.localTreeOscPort;
-  specif.wsPort = ctx.app.applicationSettings.localTreeWebsocketPort;
+  specif.oscPort = Protocols::LocalProtocolFactory::defaultOscPort;
+  specif.wsPort = Protocols::LocalProtocolFactory::defaultWsPort;
   s.deviceSpecificSettings = QVariant::fromValue(specif);
   return s;
 }