# HG changeset patch
# User Chris Cannam
# Date 1570714284 -3600
# Node ID bf5eadde7e7a203df0f1d1b60c7a1d6528346f47
# Parent  446006ea90997cf928e93e20ccda0d32f8c180c9# Parent  82cf7cf4bfefa0195714b24e2ddde6109718cbab
Merge

diff -r 446006ea9099 -r bf5eadde7e7a .hgtags
--- a/.hgtags	Thu Oct 10 14:31:11 2019 +0100
+++ b/.hgtags	Thu Oct 10 14:31:24 2019 +0100
@@ -92,3 +92,5 @@
 1d87a709fe1a8ba900e470d2b34a264352e612cd sv_v3.3pre2
 efea4a6a909a372460de1d21bf7d473c50bfeaac sv_v3.3pre2
 44d0b0fc4d04ebafa4660dba29ba437b34c621ba sv_v4.0pre1
+6845d7dafebf4cd230e5370bd2d2575d9e7551cd sv_v4.0pre2
+c56056a3dfb2cd1c2896e3ccc3841935efb460bb sv_v4.0pre2_deb_deploy
diff -r 446006ea9099 -r bf5eadde7e7a configure
--- a/configure	Thu Oct 10 14:31:11 2019 +0100
+++ b/configure	Thu Oct 10 14:31:24 2019 +0100
@@ -8723,11 +8723,11 @@
       fi
    fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: No Repoint executable found: assuming external libraries are already here" >&5
-$as_echo "$as_me: No Repoint executable found: assuming external libraries are already here" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: No Repoint executable found: assuming external components are already here" >&5
+$as_echo "$as_me: No Repoint executable found: assuming external components are already here" >&6;}
    if ! test -d vamp-plugin-sdk ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&5
-$as_echo "$as_me: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No vamp-plugin-sdk directory present, so external components might not have been updated" >&5
+$as_echo "$as_me: WARNING: No vamp-plugin-sdk directory present, so external components might not have been updated" >&2;}
    fi
 fi
 
diff -r 446006ea9099 -r bf5eadde7e7a configure.ac
--- a/configure.ac	Thu Oct 10 14:31:11 2019 +0100
+++ b/configure.ac	Thu Oct 10 14:31:24 2019 +0100
@@ -166,9 +166,9 @@
       fi
    fi
 else
-   AC_MSG_NOTICE([No Repoint executable found: assuming external libraries are already here])
+   AC_MSG_NOTICE([No Repoint executable found: assuming external components are already here])
    if ! test -d vamp-plugin-sdk ; then
-      AC_MSG_WARN([No vamp-plugin-sdk directory present, so external libraries might not have been updated])
+      AC_MSG_WARN([No vamp-plugin-sdk directory present, so external components might not have been updated])
    fi
 fi
 
diff -r 446006ea9099 -r bf5eadde7e7a main/main.cpp
--- a/main/main.cpp	Thu Oct 10 14:31:11 2019 +0100
+++ b/main/main.cpp	Thu Oct 10 14:31:24 2019 +0100
@@ -264,17 +264,19 @@
     parser.addHelpOption();
     parser.addVersionOption();
 
-    parser.addOptions({
-            { "no-audio", QApplication::tr
-              ("Do not attempt to open an audio output device.") },
-            { "no-osc", QApplication::tr
-              ("Do not provide an Open Sound Control port for remote control.") },
-            { "no-splash", QApplication::tr
-              ("Do not show a splash screen.") },
-            { "osc-script", QApplication::tr
-              ("Batch run the Open Sound Control script found in the given file. Supply \"-\" as file to read from stdin. Scripts consist of /command arg1 arg2 ... OSC control lines, optionally interleaved with numbers to specify pauses in seconds."),
-              "osc.txt" }
-        });
+    parser.addOption(QCommandLineOption
+                     ("no-audio", QApplication::tr
+                      ("Do not attempt to open an audio output device.")));
+    parser.addOption(QCommandLineOption
+                     ("no-osc", QApplication::tr
+                      ("Do not provide an Open Sound Control port for remote control.")));
+    parser.addOption(QCommandLineOption
+                     ("no-splash", QApplication::tr
+                      ("Do not show a splash screen.")));
+    parser.addOption(QCommandLineOption
+                     ("osc-script", QApplication::tr
+                      ("Batch run the Open Sound Control script found in the given file. Supply \"-\" as file to read from stdin. Scripts consist of /command arg1 arg2 ... OSC control lines, optionally interleaved with numbers to specify pauses in seconds."),
+                      "osc.txt"));
 
     parser.addPositionalArgument
         ("[<file> ...]", QApplication::tr("One or more Sonic Visualiser (.sv) and audio files may be provided."));
diff -r 446006ea9099 -r bf5eadde7e7a repoint-lock.json
--- a/repoint-lock.json	Thu Oct 10 14:31:11 2019 +0100
+++ b/repoint-lock.json	Thu Oct 10 14:31:24 2019 +0100
@@ -4,7 +4,7 @@
       "pin": "0b6802e3b755"
     },
     "svcore": {
-      "pin": "13bd41bd8a17"
+      "pin": "6eb3a76c74f7"
     },
     "svgui": {
       "pin": "bfd8b22fd67c"