Mercurial > hg > vamp-plugin-sdk
changeset 308:34754c776530
* Further fix to version handling
| author | cannam |
|---|---|
| date | Thu, 26 Aug 2010 09:30:53 +0000 |
| parents | ebc47e614cf5 |
| children | 003147fdf42c |
| files | build/update-version.sh rdf/generator/vamp-rdf-template-generator.cpp src/vamp-hostsdk/PluginHostAdapter.cpp src/vamp-sdk/PluginAdapter.cpp |
| diffstat | 4 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/build/update-version.sh Wed Aug 25 16:09:15 2010 +0000 +++ b/build/update-version.sh Thu Aug 26 09:30:53 2010 +0000 @@ -66,6 +66,18 @@ $p 's/(VAMP_SDK_MINOR_VERSION).*/$1 '$minor'/' \ vamp-sdk/PluginBase.h +$p 's/(VAMP_SDK_MAJOR_VERSION !=) \d+/$1 '$major'/' \ + src/vamp-sdk/PluginAdapter.cpp + +$p 's/(VAMP_SDK_MINOR_VERSION !=) \d+/$1 '$minor'/' \ + src/vamp-sdk/PluginAdapter.cpp + +$p 's/(VAMP_SDK_MAJOR_VERSION !=) \d+/$1 '$major'/' \ + src/vamp-hostsdk/PluginHostAdapter.cpp + +$p 's/(VAMP_SDK_MINOR_VERSION !=) \d+/$1 '$minor'/' \ + src/vamp-hostsdk/PluginHostAdapter.cpp + for pc in pkgconfig/*.pc.in ; do $p 's/(Version:) .*/$1 '$version'/' $pc done
--- a/rdf/generator/vamp-rdf-template-generator.cpp Wed Aug 25 16:09:15 2010 +0000 +++ b/rdf/generator/vamp-rdf-template-generator.cpp Thu Aug 26 09:30:53 2010 +0000 @@ -250,7 +250,7 @@ res+=" vamp:bin_count "+to_string(o.binCount)+" ;\n"; bool haveBinNames = false; - for (int i=0; i < o.binNames.size(); i++) { + for (unsigned int i=0; i < o.binNames.size(); i++) { if (o.binNames[i] != "") { haveBinNames = true; break; @@ -309,7 +309,7 @@ res+=" vamp:bin_count "+to_string(o.binCount)+" ;\n"; bool haveBinNames = false; - for (int i=0; i < o.binNames.size(); i++) { + for (unsigned int i=0; i < o.binNames.size(); i++) { if (o.binNames[i] != "") { haveBinNames = true; break;
--- a/src/vamp-hostsdk/PluginHostAdapter.cpp Wed Aug 25 16:09:15 2010 +0000 +++ b/src/vamp-hostsdk/PluginHostAdapter.cpp Thu Aug 26 09:30:53 2010 +0000 @@ -37,8 +37,8 @@ #include <vamp-hostsdk/PluginHostAdapter.h> #include <cstdlib> -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 0 ) -#error Incorrect Vamp SDK header included (not the expected 2.0 SDK) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 2 ) +#error Unexpected version of Vamp SDK header included #endif _VAMP_SDK_HOSTSPACE_BEGIN(PluginHostAdapter.cpp)
--- a/src/vamp-sdk/PluginAdapter.cpp Wed Aug 25 16:09:15 2010 +0000 +++ b/src/vamp-sdk/PluginAdapter.cpp Thu Aug 26 09:30:53 2010 +0000 @@ -39,8 +39,8 @@ #include <cstring> #include <cstdlib> -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 0 ) -#error Incorrect Vamp SDK header included (not the expected 2.0 SDK) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 2 ) +#error Unexpected version of Vamp SDK header included #endif