# HG changeset patch
# User Chris Cannam
# Date 1553780304 0
# Node ID ca0ee1fe88c7a5f283e5a2b2bed45769b8e21510
# Parent  e870eb30790103bd95834cb78eebb845aae9e689
Support OSC script even with no OSC port

diff -r e870eb307901 -r ca0ee1fe88c7 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Mar 28 11:58:58 2019 +0000
+++ b/main/MainWindow.cpp	Thu Mar 28 13:38:24 2019 +0000
@@ -332,11 +332,6 @@
     NetworkPermissionTester tester(withOSCSupport);
     bool networkPermission = tester.havePermission();
     if (networkPermission) {
-        if (withOSCSupport) {
-            SVDEBUG << "MainWindow: Creating OSC queue" << endl;
-            startOSCQueue();
-        }
-
         SVDEBUG << "MainWindow: Starting transform population thread" << endl;
         TransformFactory::getInstance()->startPopulationThread();
 
@@ -354,6 +349,16 @@
         m_versionTester = nullptr;
     }
 
+    if (withOSCSupport && networkPermission) {
+        SVDEBUG << "MainWindow: Creating OSC queue with network port"
+                << endl;
+        startOSCQueue(true);
+    } else {
+        SVDEBUG << "MainWindow: Creating internal-only OSC queue without port"
+                << endl;
+        startOSCQueue(false);
+    }
+    
 /*
     QTimer::singleShot(500, this, SLOT(betaReleaseWarning()));
 */
diff -r e870eb307901 -r ca0ee1fe88c7 main/main.cpp
--- a/main/main.cpp	Thu Mar 28 11:58:58 2019 +0000
+++ b/main/main.cpp	Thu Mar 28 13:38:24 2019 +0000
@@ -292,6 +292,13 @@
     bool oscSupport = !(parser.isSet("no-osc"));
     bool showSplash = !(parser.isSet("no-splash"));
 
+    if (!audioOutput) {
+        SVDEBUG << "Note: --no-audio flag set, will not use audio device" << endl;
+    }
+    if (!oscSupport) {
+        SVDEBUG << "Note: --no-osc flag set, will not open OSC port" << endl;
+    }
+    
     args = parser.positionalArguments();
 
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
@@ -469,6 +476,8 @@
 
     QString scriptFile = parser.value("osc-script");
     if (scriptFile != "") {
+        SVDEBUG << "Note: Cueing OSC script from filename \"" << scriptFile
+                << "\"" << endl;
         gui->cueOSCScript(scriptFile);
     }
     
diff -r e870eb307901 -r ca0ee1fe88c7 repoint-lock.json
--- a/repoint-lock.json	Thu Mar 28 11:58:58 2019 +0000
+++ b/repoint-lock.json	Thu Mar 28 13:38:24 2019 +0000
@@ -4,13 +4,13 @@
       "pin": "b650289c47b4"
     },
     "svcore": {
-      "pin": "f97d64b8674f"
+      "pin": "1078f0ef3012"
     },
     "svgui": {
       "pin": "b22a4df37095"
     },
     "svapp": {
-      "pin": "029c224384d1"
+      "pin": "94f518af106c"
     },
     "checker": {
       "pin": "5c60e26e16ca"