# HG changeset patch
# User Chris Cannam
# Date 1432137112 -3600
# Node ID 126a60e6dc4ed4547ef425da82c02cdb045c486b
# Parent  3cd80757becfcfc310ccf6a6ea8c333f2e2d647d# Parent  4ec736a365466d62600e579df960f47be232ed3a
Merge

diff -r 3cd80757becf -r 126a60e6dc4e src/vamp-hostsdk/acsymbols.c
--- a/src/vamp-hostsdk/acsymbols.c	Wed Mar 11 13:29:17 2015 +0000
+++ b/src/vamp-hostsdk/acsymbols.c	Wed May 20 16:51:52 2015 +0100
@@ -1,6 +1,7 @@
 /* These stubs are provided so that autoconf can check library
  * versions using C symbols only */
 
+extern void libvamphostsdk_v_2_6_present(void) { }
 extern void libvamphostsdk_v_2_5_present(void) { }
 extern void libvamphostsdk_v_2_4_present(void) { }
 extern void libvamphostsdk_v_2_3_1_present(void) { }
diff -r 3cd80757becf -r 126a60e6dc4e vamp-hostsdk/PluginLoader.h
--- a/vamp-hostsdk/PluginLoader.h	Wed Mar 11 13:29:17 2015 +0000
+++ b/vamp-hostsdk/PluginLoader.h	Wed May 20 16:51:52 2015 +0100
@@ -66,6 +66,9 @@
  * class, and are certainly not required to use this actual class.
  * But we do strongly recommend it.
  *
+ * This class is not thread-safe; use it from a single application
+ * thread, or guard access to it with a mutex.
+ *
  * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
  */
 
diff -r 3cd80757becf -r 126a60e6dc4e vamp/vamp.h
--- a/vamp/vamp.h	Wed Mar 11 13:29:17 2015 +0000
+++ b/vamp/vamp.h	Wed May 20 16:51:52 2015 +0100
@@ -250,7 +250,7 @@
     /** API version with which this descriptor is compatible. */
     unsigned int vampApiVersion;
 
-    /** Computer-usable name of the plugin. Must not change. [a-zA-Z0-9_] */
+    /** Computer-usable name of the plugin. Must not change. [a-zA-Z0-9_-] */
     const char *identifier;
 
     /** Human-readable name of the plugin. May be translatable. */