# HG changeset patch
# User Chris Cannam
# Date 1478342501 0
# Node ID 2d1fa10ce2c9e4fa21ec0d46a97e86b10715cac3
# Parent  26d94a5bdc85f8ae35de54f7feed6b4cde2d6ef6# Parent  b5bce5d34927fa68a8cfbc56d20d8fcb3b021bf7
Merge from branch piper

diff -r 26d94a5bdc85 -r 2d1fa10ce2c9 .hgsubstate
--- a/.hgsubstate	Fri Nov 04 16:44:59 2016 +0000
+++ b/.hgsubstate	Sat Nov 05 10:41:41 2016 +0000
@@ -7,6 +7,6 @@
 ca39a12af53b71e13596a930b828eb1a920238e4 piper-cpp
 e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
 47db3b8f406360cbcfd7bef087ccf893b3c1c0e2 svapp
-303039dd9e05770cd45e51741b383e0c21b53b8e svcore
+ca9032dd28118165ae662063779203417b731786 svcore
 081c7ebf1fea0a2cb6e7b97be86230cf81555264 svgui
 8e846c1aed96189f020024cdadd0d37bf69d3e3a vamp-plugin-sdk
diff -r 26d94a5bdc85 -r 2d1fa10ce2c9 config.pri.in
--- a/config.pri.in	Fri Nov 04 16:44:59 2016 +0000
+++ b/config.pri.in	Sat Nov 05 10:41:41 2016 +0000
@@ -18,3 +18,5 @@
 
 LIBS += @LIBS@
 
+DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER
+
diff -r 26d94a5bdc85 -r 2d1fa10ce2c9 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Fri Nov 04 16:44:59 2016 +0000
+++ b/main/MainWindow.cpp	Sat Nov 05 10:41:41 2016 +0000
@@ -4661,14 +4661,12 @@
 #endif // HAVE_FFTW3F
 #ifdef HAVE_RUBBERBAND
 #ifdef RUBBERBAND_VERSION
-    aboutText += tr("<br>With Rubber Band v%1 &copy; Chris Cannam").arg(RUBBERBAND_VERSION);
+    aboutText += tr("<br>With Rubber Band Library v%1 &copy; Particular Programs Ltd").arg(RUBBERBAND_VERSION);
 #else // !RUBBERBAND_VERSION
-    aboutText += tr("<br>With Rubber Band &copy; Chris Cannam");
+    aboutText += tr("<br>With Rubber Band Library &copy; Particular Programs Ltd");
 #endif // RUBBERBAND_VERSION
 #endif // HAVE_RUBBERBAND
-#ifdef HAVE_VAMP
-    aboutText += tr("<br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
-#endif // !HAVE_VAMP
+    aboutText += tr("<br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam and QMUL").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
     aboutText += tr("<br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld").arg(LADSPA_VERSION);
     aboutText += tr("<br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton").arg(DSSI_VERSION);
 #ifdef REDLAND_VERSION
@@ -4677,8 +4675,8 @@
     aboutText += tr("<br>With Redland RDF datastore &copy; Dave Beckett and the University of Bristol");
 #endif // REDLAND_VERSION
     aboutText += tr("<br>With Serd and Sord RDF parser and store &copy; David Robillard");
-    aboutText += tr("<br>With Dataquay Qt/RDF library &copy; Chris Cannam");
-
+    aboutText += tr("<br>With Dataquay Qt/RDF library &copy; Particular Programs Ltd");
+    aboutText += tr("<br>With Cap'n Proto serialisation &copy; Sandstorm Development Group");
     aboutText += tr("<br>With RtMidi &copy; Gary P. Scavone");
 
 #ifdef HAVE_LIBLO
diff -r 26d94a5bdc85 -r 2d1fa10ce2c9 noconfig.pri
--- a/noconfig.pri	Fri Nov 04 16:44:59 2016 +0000
+++ b/noconfig.pri	Sat Nov 05 10:41:41 2016 +0000
@@ -7,6 +7,8 @@
 DEFINES += NDEBUG BUILD_RELEASE
 DEFINES += NO_TIMING
 
+DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER
+
 # Full set of defines expected for all platforms when we have the
 # sv-dependency-builds subrepo available to provide the dependencies.