# HG changeset patch
# User Chris Cannam
# Date 1591288767 -3600
# Node ID ddcbbd85c1eab564ebc4e4f08c1b27f989b6f922
# Parent  d9d509d29fa177e2cff3128f08cd7b78f9c9bd7c
Towards a 1.6 release - primarily for Opus support

diff -r d9d509d29fa1 -r ddcbbd85c1ea noconfig.pri
--- a/noconfig.pri	Tue May 19 08:52:01 2020 +0100
+++ b/noconfig.pri	Thu Jun 04 17:39:27 2020 +0100
@@ -78,7 +78,7 @@
             -L$$PWD/sv-dependency-builds/win64-msvc/lib
     }
 
-    DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_MEDIAFOUNDATION
+    DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_MEDIAFOUNDATION AVOID_WINRT_DEPENDENCY
 
     QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl
     QMAKE_LFLAGS_RELEASE += -ltcg
diff -r d9d509d29fa1 -r ddcbbd85c1ea repoint-lock.json
--- a/repoint-lock.json	Tue May 19 08:52:01 2020 +0100
+++ b/repoint-lock.json	Thu Jun 04 17:39:27 2020 +0100
@@ -1,10 +1,10 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "8ffb8985ae8f"
+      "pin": "0e32c328b02a"
     },
     "svcore": {
-      "pin": "db489a1ece9b"
+      "pin": "14bf9bf5ac28"
     },
     "checker": {
       "pin": "e839338d3869"
diff -r d9d509d29fa1 -r ddcbbd85c1ea runner/main.cpp
--- a/runner/main.cpp	Tue May 19 08:52:01 2020 +0100
+++ b/runner/main.cpp	Thu Jun 04 17:39:27 2020 +0100
@@ -192,7 +192,7 @@
     cerr << "Sonic Annotator v" << RUNNER_VERSION << endl;
     cerr << "A utility for batch feature extraction from audio files." << endl;
     cerr << "Mark Levy, Chris Sutton, and Chris Cannam, Queen Mary, University of London." << endl;
-    cerr << "Copyright 2007-2017 Queen Mary, University of London." << endl;
+    cerr << "Copyright 2007-2020 Queen Mary, University of London." << endl;
     cerr << endl;
     cerr << "This program is free software.  You may redistribute copies of it under the" << endl;
     cerr << "terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>." << endl;
diff -r d9d509d29fa1 -r ddcbbd85c1ea tests/audio/3clicks.opus
Binary file tests/audio/3clicks.opus has changed
diff -r d9d509d29fa1 -r ddcbbd85c1ea tests/include.sh
--- a/tests/include.sh	Tue May 19 08:52:01 2020 +0100
+++ b/tests/include.sh	Thu Jun 04 17:39:27 2020 +0100
@@ -13,12 +13,12 @@
     ;;
 esac
 
-version=1.5pre
-nextversion=1.6
-
 testdir=$mypath/..
 r=$testdir/../sonic-annotator
 
+version=$(perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' $testdir/../version.h | sed 's/-//g')
+nextversion=$version.1
+
 audiopath=$testdir/audio
 
 percplug=vamp:vamp-example-plugins:percussiononsets
diff -r d9d509d29fa1 -r ddcbbd85c1ea tests/test-audioformat/expected/percussiononsets-opus.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-audioformat/expected/percussiononsets-opus.csv	Thu Jun 04 17:39:27 2020 +0100
@@ -0,0 +1,3 @@
+"./../audio/3clicks.opus",0.778666666
+,1.653333333
+,2.410666666
diff -r d9d509d29fa1 -r ddcbbd85c1ea tests/test-audioformat/test-audioformat.sh
--- a/tests/test-audioformat/test-audioformat.sh	Tue May 19 08:52:01 2020 +0100
+++ b/tests/test-audioformat/test-audioformat.sh	Thu Jun 04 17:39:27 2020 +0100
@@ -8,7 +8,7 @@
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-for extension in wav ogg mp3 ; do
+for extension in wav ogg mp3 opus ; do
 
     transform=$mypath/transforms/percussiononsets.n3 
     expected=$mypath/expected/percussiononsets-$extension.csv
diff -r d9d509d29fa1 -r ddcbbd85c1ea tests/test-multiple-audio/expected/all-files.csv
--- a/tests/test-multiple-audio/expected/all-files.csv	Tue May 19 08:52:01 2020 +0100
+++ b/tests/test-multiple-audio/expected/all-files.csv	Thu Jun 04 17:39:27 2020 +0100
@@ -7,6 +7,9 @@
 "./../audio/3clicks.ogg",0.000000000,4.992290250,mean,0.000303,"(mean value, continuous-time average)"
 ,0.000000000,4.992290250,median,2.42e-5,"(median value, continuous-time average)"
 ,0.000000000,4.992290250,mean,0.00108,"(mean value, continuous-time average)"
+"./../audio/3clicks.opus",0.000000000,4.992290250,mean,0.00232,"(mean value, continuous-time average)"
+,0.000000000,4.992290250,median,0.00208,"(median value, continuous-time average)"
+,0.000000000,4.992290250,mean,0.00304,"(mean value, continuous-time average)"
 "./../audio/3clicks8.wav",0.000000000,4.992290250,mean,0.00369,"(mean value, continuous-time average)"
 ,0.000000000,4.992290250,median,0.00354,"(median value, continuous-time average)"
 ,0.000000000,4.992290250,mean,0.0042,"(mean value, continuous-time average)"
diff -r d9d509d29fa1 -r ddcbbd85c1ea version.h
--- a/version.h	Tue May 19 08:52:01 2020 +0100
+++ b/version.h	Thu Jun 04 17:39:27 2020 +0100
@@ -1,1 +1,1 @@
-#define RUNNER_VERSION "1.5"
+#define RUNNER_VERSION "1.6"