# HG changeset patch
# User Chris Cannam
# Date 1458311105 0
# Node ID f39869a1cbc0983236725718f5694972f4388226
# Parent  1040d7d70eca8b04409e804694b43d52e24142c3
Start including Vamp SDK into main build, as we do with Sonic Annotator

diff -r 1040d7d70eca -r f39869a1cbc0 .hgsub
--- a/.hgsub	Fri Mar 04 12:40:18 2016 +0000
+++ b/.hgsub	Fri Mar 18 14:25:05 2016 +0000
@@ -1,3 +1,4 @@
+vamp-plugin-sdk = https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk
 svcore = https://code.soundsoftware.ac.uk/hg/svcore
 svgui = https://code.soundsoftware.ac.uk/hg/svgui
 svapp = https://code.soundsoftware.ac.uk/hg/svapp
diff -r 1040d7d70eca -r f39869a1cbc0 .hgsubstate
--- a/.hgsubstate	Fri Mar 04 12:40:18 2016 +0000
+++ b/.hgsubstate	Fri Mar 18 14:25:05 2016 +0000
@@ -3,7 +3,8 @@
 a518ddd9dd68917393887d28dfee6221bc37fb66 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
-55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-36777aa80e15228eec6ecaa8f88a5a14f1647b53 svapp
-abb78e8248208947b1280f82f24013e20e8c4f6e svcore
-40480e4bab6a58963ec7af8c4c8abe1b2fcdf17a svgui
+892ab05455884849e8c0fc84254281d95bb72e04 sv-dependency-builds
+f7ec9e410108fe08580cf61e328b73fe8c7e4e1d svapp
+4018fc0189bc46bf36ce1961ae558377afff2c6e svcore
+3691af49291c57a31883fd27190586737935b12b svgui
+55de53d7c777008997721bb43051a67c3b3772d2 vamp-plugin-sdk
diff -r 1040d7d70eca -r f39869a1cbc0 configure.ac
--- a/configure.ac	Fri Mar 04 12:40:18 2016 +0000
+++ b/configure.ac	Fri Mar 18 14:25:05 2016 +0000
@@ -83,8 +83,6 @@
 SV_MODULE_REQUIRED([fftw3f],[fftw3f >= 3.0.0],[fftw3.h],[fftw3f],[fftwf_execute])
 SV_MODULE_REQUIRED([sndfile],[sndfile >= 1.0.16],[sndfile.h],[sndfile],[sf_open])
 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new])
-SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
-SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.5],[vamp-hostsdk/PluginLoader.h],[vamp-hostsdk],[libvamphostsdk_v_2_5_present])
 SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new])
 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file])
diff -r 1040d7d70eca -r f39869a1cbc0 sv.pro
--- a/sv.pro	Fri Mar 04 12:40:18 2016 +0000
+++ b/sv.pro	Fri Mar 18 14:25:05 2016 +0000
@@ -1,6 +1,8 @@
 
 TEMPLATE = app
 
+INCLUDEPATH += vamp-plugin-sdk
+
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
     LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib
@@ -84,18 +86,40 @@
 
 RESOURCES += sonic-visualiser.qrc
 
-HEADERS += main/MainWindow.h \
-           main/NetworkPermissionTester.h \
-           main/Surveyer.h \
-           main/SVSplash.h \
-           main/PreferencesDialog.h
-SOURCES += main/main.cpp \
-           main/OSCHandler.cpp \
-           main/MainWindow.cpp \
-           main/NetworkPermissionTester.cpp \
-           main/Surveyer.cpp \
-           main/SVSplash.cpp \
-           main/PreferencesDialog.cpp 
+HEADERS += \
+        vamp-plugin-sdk/vamp-hostsdk/PluginBase.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginBufferingAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginChannelAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/Plugin.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginHostAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginInputDomainAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginLoader.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginSummarisingAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginWrapper.h \
+        vamp-plugin-sdk/vamp-hostsdk/RealTime.h \
+        vamp-plugin-sdk/src/vamp-hostsdk/Window.h \
+        main/MainWindow.h \
+        main/NetworkPermissionTester.h \
+        main/Surveyer.h \
+        main/SVSplash.h \
+        main/PreferencesDialog.h
+SOURCES +=  \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginBufferingAdapter.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginChannelAdapter.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginHostAdapter.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginLoader.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/PluginWrapper.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \
+        vamp-plugin-sdk/src/vamp-hostsdk/Files.cpp \
+	main/main.cpp \
+        main/OSCHandler.cpp \
+        main/MainWindow.cpp \
+        main/NetworkPermissionTester.cpp \
+        main/Surveyer.cpp \
+        main/SVSplash.cpp \
+        main/PreferencesDialog.cpp 
 
 # for mac integration
 QMAKE_INFO_PLIST = deploy/osx/Info.plist