# HG changeset patch # User Chris Cannam # Date 1589795293 -3600 # Node ID 15a89a89aa9b62e8f07408ab48652a0e0282e47d # Parent 8ffb8985ae8fc8840968ac4372e8c02cb4e1961a Update version number and CHANGELOG diff -r 8ffb8985ae8f -r 15a89a89aa9b CHANGELOG --- a/CHANGELOG Thu Apr 23 11:39:34 2020 +0100 +++ b/CHANGELOG Mon May 18 10:48:13 2020 +0100 @@ -1,3 +1,13 @@ + +Version 2.10, 2020-05-18 (minor feature release) + + * Add a method to PluginWrapper, the host-side base for adapters + like PluginInputDomainAdapter that modify the processing behaviour + of a plugin, that tells it to "disown" the wrapped plugin. The + former behaviour, and still the default, is for the wrapper to + take ownership of the wrapped plugin. The alternative behaviour + makes it easier to mix these classes with some modern C++ styles + that use managed pointers Version 2.9, 2019-11-13 (maintenance release) diff -r 8ffb8985ae8f -r 15a89a89aa9b Makefile.in --- a/Makefile.in Thu Apr 23 11:39:34 2020 +0100 +++ b/Makefile.in Mon May 18 10:48:13 2020 +0100 @@ -78,13 +78,13 @@ INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp INSTALL_BINARIES = $(INSTALL_PREFIX)/bin -INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.9.0 +INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.10.0 INSTALL_SDK_LINK_ABI = libvamp-sdk.so.2 INSTALL_SDK_LINK_DEV = libvamp-sdk.so INSTALL_SDK_STATIC = libvamp-sdk.a INSTALL_SDK_LA = libvamp-sdk.la -INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.9.0 +INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.10.0 INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.so.3 INSTALL_HOSTSDK_LINK_DEV = libvamp-hostsdk.so INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a @@ -113,7 +113,7 @@ HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -exported_symbols_list build/vamp-plugin.list - INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.9.0.dylib + INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.10.0.dylib INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.3.dylib # The OS X linker doesn't allow you to request static linkage when @@ -122,7 +122,7 @@ # dynamic, the static library will never be used. That's OK for the # host SDK, but we do want plugins to get static linkage of the plugin # SDK. So install the dynamic version under a different name. - INSTALL_SDK_LIBNAME = libvamp-sdk-dynamic.2.9.0.dylib + INSTALL_SDK_LIBNAME = libvamp-sdk-dynamic.2.10.0.dylib INSTALL_SDK_LINK_ABI = libvamp-sdk-dynamic.2.dylib endif diff -r 8ffb8985ae8f -r 15a89a89aa9b README --- a/README Thu Apr 23 11:39:34 2020 +0100 +++ b/README Mon May 18 10:48:13 2020 +0100 @@ -9,7 +9,7 @@ Vamp is an API for C and C++ plugins that process sampled audio data to produce descriptive output (measurements or semantic observations). -This is version 2.9 of the Vamp plugin Software Development Kit. +This is version 2.10 of the Vamp plugin Software Development Kit. Plugins and hosts built with this SDK are binary compatible with those built using any version 2.0 or newer of the SDK. diff -r 8ffb8985ae8f -r 15a89a89aa9b build/Doxyfile --- a/build/Doxyfile Thu Apr 23 11:39:34 2020 +0100 +++ b/build/Doxyfile Mon May 18 10:48:13 2020 +0100 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.9 +PROJECT_NUMBER = 2.10 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -r 8ffb8985ae8f -r 15a89a89aa9b build/libvamp-hostsdk.la.in --- a/build/libvamp-hostsdk.la.in Thu Apr 23 11:39:34 2020 +0100 +++ b/build/libvamp-hostsdk.la.in Mon May 18 10:48:13 2020 +0100 @@ -8,7 +8,7 @@ old_library='%STATIC%' dependency_libs='' current=3 -age=9 +age=10 revision=0 installed=yes libdir='%LIBS%' diff -r 8ffb8985ae8f -r 15a89a89aa9b build/libvamp-sdk.la.in --- a/build/libvamp-sdk.la.in Thu Apr 23 11:39:34 2020 +0100 +++ b/build/libvamp-sdk.la.in Mon May 18 10:48:13 2020 +0100 @@ -8,7 +8,7 @@ old_library='%STATIC%' dependency_libs='' current=2 -age=9 +age=10 revision=0 installed=yes libdir='%LIBS%' diff -r 8ffb8985ae8f -r 15a89a89aa9b configure --- a/configure Thu Apr 23 11:39:34 2020 +0100 +++ b/configure Mon May 18 10:48:13 2020 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for vamp-plugin-sdk 2.9. +# Generated by GNU Autoconf 2.69 for vamp-plugin-sdk 2.10. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='vamp-plugin-sdk' PACKAGE_TARNAME='vamp-plugin-sdk' -PACKAGE_VERSION='2.9' -PACKAGE_STRING='vamp-plugin-sdk 2.9' +PACKAGE_VERSION='2.10' +PACKAGE_STRING='vamp-plugin-sdk 2.10' PACKAGE_BUGREPORT='cannam@all-day-breakfast.com' PACKAGE_URL='' @@ -1244,7 +1244,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vamp-plugin-sdk 2.9 to adapt to many kinds of systems. +\`configure' configures vamp-plugin-sdk 2.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1305,7 +1305,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vamp-plugin-sdk 2.9:";; + short | recursive ) echo "Configuration of vamp-plugin-sdk 2.10:";; esac cat <<\_ACEOF @@ -1403,7 +1403,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vamp-plugin-sdk configure 2.9 +vamp-plugin-sdk configure 2.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1652,7 +1652,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vamp-plugin-sdk $as_me 2.9, which was +It was created by vamp-plugin-sdk $as_me 2.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4648,7 +4648,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vamp-plugin-sdk $as_me 2.9, which was +This file was extended by vamp-plugin-sdk $as_me 2.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4701,7 +4701,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vamp-plugin-sdk config.status 2.9 +vamp-plugin-sdk config.status 2.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -r 8ffb8985ae8f -r 15a89a89aa9b configure.ac --- a/configure.ac Thu Apr 23 11:39:34 2020 +0100 +++ b/configure.ac Mon May 18 10:48:13 2020 +0100 @@ -1,5 +1,5 @@ -AC_INIT(vamp-plugin-sdk, 2.9, cannam@all-day-breakfast.com) +AC_INIT(vamp-plugin-sdk, 2.10, cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(vamp/vamp.h) AC_PROG_CXX diff -r 8ffb8985ae8f -r 15a89a89aa9b pkgconfig/vamp-hostsdk.pc.in --- a/pkgconfig/vamp-hostsdk.pc.in Thu Apr 23 11:39:34 2020 +0100 +++ b/pkgconfig/vamp-hostsdk.pc.in Mon May 18 10:48:13 2020 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-hostsdk -Version: 2.9 +Version: 2.10 Description: Development library for Vamp audio analysis plugin hosts Libs: -L${libdir} -lvamp-hostsdk -ldl Cflags: -I${includedir} diff -r 8ffb8985ae8f -r 15a89a89aa9b pkgconfig/vamp-sdk.pc.in --- a/pkgconfig/vamp-sdk.pc.in Thu Apr 23 11:39:34 2020 +0100 +++ b/pkgconfig/vamp-sdk.pc.in Mon May 18 10:48:13 2020 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-sdk -Version: 2.9 +Version: 2.10 Description: Development library for Vamp audio analysis plugins Libs: -L${libdir} -lvamp-sdk Cflags: -I${includedir} diff -r 8ffb8985ae8f -r 15a89a89aa9b pkgconfig/vamp.pc.in --- a/pkgconfig/vamp.pc.in Thu Apr 23 11:39:34 2020 +0100 +++ b/pkgconfig/vamp.pc.in Mon May 18 10:48:13 2020 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp -Version: 2.9 +Version: 2.10 Description: An API for audio analysis and feature extraction plugins Libs: Cflags: -I${includedir} diff -r 8ffb8985ae8f -r 15a89a89aa9b src/vamp-hostsdk/PluginHostAdapter.cpp --- a/src/vamp-hostsdk/PluginHostAdapter.cpp Thu Apr 23 11:39:34 2020 +0100 +++ b/src/vamp-hostsdk/PluginHostAdapter.cpp Mon May 18 10:48:13 2020 +0100 @@ -39,7 +39,7 @@ #include "Files.h" -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 9 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 10 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8ffb8985ae8f -r 15a89a89aa9b src/vamp-hostsdk/acsymbols.c --- a/src/vamp-hostsdk/acsymbols.c Thu Apr 23 11:39:34 2020 +0100 +++ b/src/vamp-hostsdk/acsymbols.c Mon May 18 10:48:13 2020 +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_10_present(void) { } extern void libvamphostsdk_v_2_9_present(void) { } extern void libvamphostsdk_v_2_8_present(void) { } extern void libvamphostsdk_v_2_7_1_present(void) { } diff -r 8ffb8985ae8f -r 15a89a89aa9b src/vamp-sdk/FFT.cpp --- a/src/vamp-sdk/FFT.cpp Thu Apr 23 11:39:34 2020 +0100 +++ b/src/vamp-sdk/FFT.cpp Mon May 18 10:48:13 2020 +0100 @@ -41,7 +41,7 @@ #include #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 9 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 10 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8ffb8985ae8f -r 15a89a89aa9b src/vamp-sdk/PluginAdapter.cpp --- a/src/vamp-sdk/PluginAdapter.cpp Thu Apr 23 11:39:34 2020 +0100 +++ b/src/vamp-sdk/PluginAdapter.cpp Mon May 18 10:48:13 2020 +0100 @@ -41,7 +41,7 @@ #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 9 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 10 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8ffb8985ae8f -r 15a89a89aa9b src/vamp-sdk/acsymbols.c --- a/src/vamp-sdk/acsymbols.c Thu Apr 23 11:39:34 2020 +0100 +++ b/src/vamp-sdk/acsymbols.c Mon May 18 10:48:13 2020 +0100 @@ -1,6 +1,7 @@ /* These stubs are provided so that autoconf can check library * versions using C symbols only */ +extern void libvampsdk_v_2_10_present(void) { } extern void libvampsdk_v_2_9_present(void) { } extern void libvampsdk_v_2_8_present(void) { } extern void libvampsdk_v_2_7_1_present(void) { } diff -r 8ffb8985ae8f -r 15a89a89aa9b vamp-hostsdk/hostguard.h --- a/vamp-hostsdk/hostguard.h Thu Apr 23 11:39:34 2020 +0100 +++ b/vamp-hostsdk/hostguard.h Mon May 18 10:48:13 2020 +0100 @@ -43,9 +43,9 @@ #define _VAMP_IN_HOSTSDK 1 -#define VAMP_SDK_VERSION "2.9" +#define VAMP_SDK_VERSION "2.10" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 9 +#define VAMP_SDK_MINOR_VERSION 10 #ifdef _VAMP_NO_HOST_NAMESPACE #define _VAMP_SDK_HOSTSPACE_BEGIN(h) diff -r 8ffb8985ae8f -r 15a89a89aa9b vamp-sdk/plugguard.h --- a/vamp-sdk/plugguard.h Thu Apr 23 11:39:34 2020 +0100 +++ b/vamp-sdk/plugguard.h Mon May 18 10:48:13 2020 +0100 @@ -71,9 +71,9 @@ #define _VAMP_IN_PLUGINSDK 1 -#define VAMP_SDK_VERSION "2.9" +#define VAMP_SDK_VERSION "2.10" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 9 +#define VAMP_SDK_MINOR_VERSION 10 #ifdef _VAMP_NO_PLUGIN_NAMESPACE #define _VAMP_SDK_PLUGSPACE_BEGIN(h)