Mercurial > hg > sonic-visualiser
changeset 1268:ba71dbc5ee8b piper
Merge from branch 3.0-integration
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Oct 2016 11:19:34 +0100 |
| parents | 83ad03154d36 (diff) 33b624877694 (current diff) |
| children | becd3a1b755f |
| files | .hgsubstate sv.pro |
| diffstat | 4 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Thu Oct 20 11:16:55 2016 +0100 +++ b/.hgsub Thu Oct 20 11:19:34 2016 +0100 @@ -9,3 +9,5 @@ sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds icons/scalable = https://code.soundsoftware.ac.uk/hg/sv-iconset checker = https://code.soundsoftware.ac.uk/hg/vamp-plugin-load-checker +piper = https://code.soundsoftware.ac.uk/hg/piper +piper-cpp = https://code.soundsoftware.ac.uk/hg/piper-cpp
--- a/.hgsubstate Thu Oct 20 11:16:55 2016 +0100 +++ b/.hgsubstate Thu Oct 20 11:19:34 2016 +0100 @@ -4,8 +4,10 @@ 92e72014d9798a7339cfb09d6f2d877d8bf7fd65 checker 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable +2ca3f7587550c7d80d0ca7b6ae1c266ca93859cd piper +3ba0d7d4af38dc1dcb1f7d357e22c31cb539e818 piper-cpp efe5b9f38b13a28cb8054da2490fa32caf4364b2 sv-dependency-builds -3ab6a5f7aca8330e0c16d74266facb615614f67d svapp -a1b97df9962e0c39486748309bee4ad63a226157 svcore +d5ca6c5bad13fb033f7533f289d29e8166dbe381 svapp +771a179255767433678439f2f0315329db136087 svcore 52675a1f662c62f94596146e4ed5b237fe562f09 svgui -9a2998401bbe0a7b9e3233eeca5004542bc0014d vamp-plugin-sdk +a75fdb8b368c706a4c033090dcdc4e9e50ebf681 vamp-plugin-sdk
--- a/README Thu Oct 20 11:16:55 2016 +0100 +++ b/README Thu Oct 20 11:19:34 2016 +0100 @@ -46,7 +46,7 @@ Christian Landone, Mathieu Barthet, Dan Stowell, Jesus Corral Garcia, Matthias Mauch, and Craig Sapp. -Code copyright 2005-2007 Chris Cannam and copyright 2006-2014 Queen +Code copyright 2005-2007 Chris Cannam and copyright 2006-2016 Queen Mary, University of London, except where indicated in the individual source files.
--- a/sv.pro Thu Oct 20 11:16:55 2016 +0100 +++ b/sv.pro Thu Oct 20 11:19:34 2016 +0100 @@ -56,6 +56,8 @@ } } +LIBS += -lcapnp -lkj ##!!! + CONFIG += qt thread warn_on stl rtti exceptions c++11 QT += network xml gui widgets svg @@ -63,8 +65,8 @@ linux*:TARGET = sonic-visualiser solaris*:TARGET = sonic-visualiser -DEPENDPATH += . bqaudioio svcore svgui svapp -INCLUDEPATH += . bqaudioio svcore svgui svapp +DEPENDPATH += . bqaudioio piper-cpp svcore svgui svapp +INCLUDEPATH += . bqaudioio piper-cpp svcore svgui svapp TRANSLATIONS += i18n/sonic-visualiser_ru.ts i18n/sonic-visualiser_en_GB.ts i18n/sonic-visualiser_en_US.ts i18n/sonic-visualiser_cs_CZ.ts @@ -152,6 +154,7 @@ vamp-plugin-sdk/src/vamp-hostsdk/PluginWrapper.cpp \ vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \ vamp-plugin-sdk/src/vamp-hostsdk/Files.cpp \ + piper-cpp/vamp-capnp/piper.capnp.c++ \ main/main.cpp \ main/OSCHandler.cpp \ main/MainWindow.cpp \