# HG changeset patch
# User Chris Cannam
# Date 1396012388 0
# Node ID 2741e4323d1dbf002f765d1bc1e7a2442976e96a
# Parent b4e9da4c2c69534e247f9ee7477f7dac5f95aaed# Parent 34ff6b72b0f4be97ac7a797eddec6287c10d828d
Merge
diff -r b4e9da4c2c69 -r 2741e4323d1d .hgignore
--- a/.hgignore Fri Mar 28 13:11:26 2014 +0000
+++ b/.hgignore Fri Mar 28 13:13:08 2014 +0000
@@ -23,3 +23,5 @@
*.filters
re:^build/_UpgradeReport_Files/
*.ipch
+re:^build/x64/Debug/
+re:^build/x64/Release/
diff -r b4e9da4c2c69 -r 2741e4323d1d .hgtags
--- a/.hgtags Fri Mar 28 13:11:26 2014 +0000
+++ b/.hgtags Fri Mar 28 13:13:08 2014 +0000
@@ -21,3 +21,4 @@
ef1dc9963638adc84bda46d4aa31b99f3229a892 vamp-plugin-sdk-v2.3
8cab5a0198d64ee606727e5f8a0683c44a55f432 vamp-plugin-sdk-v2.3
393885d7ea72d6678ea7973363cf38623fa829f5 vamp-plugin-sdk-v2.4
+92b1fbb1cc878a60a3dfd4aa036e938767705b3a vamp-plugin-sdk-v2.5
diff -r b4e9da4c2c69 -r 2741e4323d1d CHANGELOG
--- a/CHANGELOG Fri Mar 28 13:11:26 2014 +0000
+++ b/CHANGELOG Fri Mar 28 13:13:08 2014 +0000
@@ -1,4 +1,4 @@
-Version 2.5, 2013-03-28 (maintenance release):
+Version 2.5, 2013-05-08 (maintenance release):
* Fix incorrect handling of FixedSampleRate outputs in the
PluginBufferingAdapter. Un-timestamped features on these outputs
@@ -7,6 +7,8 @@
feature on the output according to the output's sample rate.
* Fix return of uninitialised memory through getCurrentProgram
when plugin specifies no programs
+ * Ensure output sample rate is initialised (to 0) for variable-rate
+ outputs where the plugin forgets to set a rate
Version 2.4, 2012-07-12 (maintenance and minor feature release):
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampExamplePlugins.sln
--- a/build/VampExamplePlugins.sln Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampExamplePlugins.sln Fri Mar 28 13:13:08 2014 +0000
@@ -1,18 +1,24 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampExamplePlugins", "VampExamplePlugins.vcxproj", "{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Win32.ActiveCfg = Debug|Win32
{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Win32.Build.0 = Debug|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|x64.ActiveCfg = Debug|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|x64.Build.0 = Debug|x64
{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Win32.ActiveCfg = Release|Win32
{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Win32.Build.0 = Release|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|x64.ActiveCfg = Release|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampExamplePlugins.vcxproj
--- a/build/VampExamplePlugins.vcxproj Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampExamplePlugins.vcxproj Fri Mar 28 13:13:08 2014 +0000
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}
@@ -18,9 +26,19 @@
DynamicLibrary
+ v110
+
+
+ DynamicLibrary
+ v110
DynamicLibrary
+ v110
+
+
+ DynamicLibrary
+ v110
@@ -28,18 +46,26 @@
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
Debug\
Debug\
true
+ true
Release\
Release\
true
+ true
@@ -63,6 +89,26 @@
MachineX86
+
+
+ Disabled
+ $(ProjectDir)/..;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;VAMPEXAMPLEPLUGINS_EXPORTS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+ 4996;%(DisableSpecificWarnings)
+
+
+ /EXPORT:vampGetPluginDescriptor %(AdditionalOptions)
+ $(OutDir)vamp-example-plugins.dll
+ true
+ Windows
+
+
$(ProjectDir)/..;%(AdditionalIncludeDirectories)
@@ -84,6 +130,26 @@
MachineX86
+
+
+ $(ProjectDir)/..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPEXAMPLEPLUGINS_EXPORTS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ 4996;%(DisableSpecificWarnings)
+
+
+ /EXPORT:vampGetPluginDescriptor %(AdditionalOptions)
+ $(OutDir)vamp-example-plugins.dll
+ true
+ Windows
+ true
+ true
+
+
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampHostSDK.sln
--- a/build/VampHostSDK.sln Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampHostSDK.sln Fri Mar 28 13:13:08 2014 +0000
@@ -1,18 +1,24 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampHostSDK", "VampHostSDK.vcxproj", "{3875EF8B-14E8-4825-B2C1-A8B869C336F5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Win32.ActiveCfg = Debug|Win32
{3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Win32.Build.0 = Debug|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|x64.ActiveCfg = Debug|x64
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|x64.Build.0 = Debug|x64
{3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Win32.ActiveCfg = Release|Win32
{3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Win32.Build.0 = Release|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|x64.ActiveCfg = Release|x64
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampHostSDK.vcxproj
--- a/build/VampHostSDK.vcxproj Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampHostSDK.vcxproj Fri Mar 28 13:13:08 2014 +0000
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{3875EF8B-14E8-4825-B2C1-A8B869C336F5}
@@ -18,9 +26,19 @@
StaticLibrary
+ v110
+
+
+ StaticLibrary
+ v110
StaticLibrary
+ v110
+
+
+ StaticLibrary
+ v110
@@ -28,9 +46,15 @@
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
@@ -53,6 +77,19 @@
EditAndContinue
+
+
+ Disabled
+ ..;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+
+
..;%(AdditionalIncludeDirectories)
@@ -64,6 +101,17 @@
ProgramDatabase
+
+
+ ..;%(AdditionalIncludeDirectories)
+ WIN32;_USE_MATH_DEFINES;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level2
+ ProgramDatabase
+
+
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampPluginSDK.sln
--- a/build/VampPluginSDK.sln Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampPluginSDK.sln Fri Mar 28 13:13:08 2014 +0000
@@ -1,18 +1,24 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampPluginSDK", "VampPluginSDK.vcxproj", "{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Win32.ActiveCfg = Debug|Win32
{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Win32.Build.0 = Debug|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|x64.ActiveCfg = Debug|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|x64.Build.0 = Debug|x64
{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Win32.ActiveCfg = Release|Win32
{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Win32.Build.0 = Release|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|x64.ActiveCfg = Release|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampPluginSDK.vcxproj
--- a/build/VampPluginSDK.vcxproj Fri Mar 28 13:11:26 2014 +0000
+++ b/build/VampPluginSDK.vcxproj Fri Mar 28 13:13:08 2014 +0000
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}
@@ -18,9 +26,19 @@
StaticLibrary
+ v110
+
+
+ StaticLibrary
+ v110
StaticLibrary
+ v110
+
+
+ StaticLibrary
+ v110
@@ -28,9 +46,15 @@
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
@@ -53,6 +77,19 @@
EditAndContinue
+
+
+ Disabled
+ ..;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+
+
..;%(AdditionalIncludeDirectories)
@@ -64,6 +101,17 @@
ProgramDatabase
+
+
+ ..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);_USE_MATH_DEFINES
+ MultiThreadedDLL
+
+
+ Level2
+ ProgramDatabase
+
+
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampSDK.sln
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build/VampSDK.sln Fri Mar 28 13:13:08 2014 +0000
@@ -0,0 +1,80 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampHostSDK", "VampHostSDK.vcxproj", "{3875EF8B-14E8-4825-B2C1-A8B869C336F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampPluginSDK", "VampPluginSDK.vcxproj", "{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampExamplePlugins", "VampExamplePlugins.vcxproj", "{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5} = {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampSimpleHost", "VampSimpleHost.vcxproj", "{6F6F2651-E7B2-42B2-8053-556FEB50A552}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5} = {3875EF8B-14E8-4825-B2C1-A8B869C336F5}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|Win32.Build.0 = Debug|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|x64.ActiveCfg = Debug|x64
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Debug|x64.Build.0 = Debug|x64
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Win32.ActiveCfg = Release|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|Win32.Build.0 = Release|Win32
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|x64.ActiveCfg = Release|x64
+ {3875EF8B-14E8-4825-B2C1-A8B869C336F5}.Release|x64.Build.0 = Release|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|Win32.Build.0 = Debug|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|x64.ActiveCfg = Debug|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Debug|x64.Build.0 = Debug|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Win32.ActiveCfg = Release|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|Win32.Build.0 = Release|Win32
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|x64.ActiveCfg = Release|x64
+ {65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}.Release|x64.Build.0 = Release|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|Win32.Build.0 = Debug|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|x64.ActiveCfg = Debug|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Debug|x64.Build.0 = Debug|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Win32.ActiveCfg = Release|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|Win32.Build.0 = Release|Win32
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|x64.ActiveCfg = Release|x64
+ {B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}.Release|x64.Build.0 = Release|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Win32.Build.0 = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|x64.ActiveCfg = Debug|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|x64.Build.0 = Debug|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Win32.ActiveCfg = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Win32.Build.0 = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|x64.ActiveCfg = Release|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampSimpleHost.sln
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build/VampSimpleHost.sln Fri Mar 28 13:13:08 2014 +0000
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VampSimpleHost", "VampSimpleHost.vcxproj", "{6F6F2651-E7B2-42B2-8053-556FEB50A552}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|Win32.Build.0 = Debug|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|x64.ActiveCfg = Debug|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Debug|x64.Build.0 = Debug|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Win32.ActiveCfg = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|Win32.Build.0 = Release|Win32
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|x64.ActiveCfg = Release|x64
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff -r b4e9da4c2c69 -r 2741e4323d1d build/VampSimpleHost.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build/VampSimpleHost.vcxproj Fri Mar 28 13:13:08 2014 +0000
@@ -0,0 +1,155 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {6F6F2651-E7B2-42B2-8053-556FEB50A552}
+ Win32Proj
+ VampSimpleHost
+
+
+
+ Application
+ true
+ v110
+ Unicode
+
+
+ Application
+ true
+ v110
+ MultiByte
+
+
+ Application
+ false
+ v110
+ true
+ Unicode
+
+
+ Application
+ false
+ v110
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ ..
+
+
+ Console
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ ..;C:\Program Files\Mega-Nerd\libsndfile\include
+
+
+ Console
+ true
+ x64\Debug\VampHostSDK.lib;C:\Program Files\Mega-Nerd\libsndfile\lib\libsndfile-1.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ ..;C:\Program Files\Mega-Nerd\libsndfile\include
+
+
+ Console
+ true
+ true
+ true
+ x64\Release\VampHostSDK.lib;C:\Program Files\Mega-Nerd\libsndfile\lib\libsndfile-1.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r b4e9da4c2c69 -r 2741e4323d1d host/vamp-simple-host.cpp
--- a/host/vamp-simple-host.cpp Fri Mar 28 13:11:26 2014 +0000
+++ b/host/vamp-simple-host.cpp Fri Mar 28 13:13:08 2014 +0000
@@ -461,7 +461,7 @@
if (sfinfo.frames > 0){
int pp = progress;
- progress = lrintf((float(currentStep * stepSize) / sfinfo.frames) * 100.f);
+ progress = (int)((float(currentStep * stepSize) / sfinfo.frames) * 100.f + 0.5f);
if (progress != pp && out) {
cerr << "\r" << progress << "%";
}
diff -r b4e9da4c2c69 -r 2741e4323d1d src/vamp-hostsdk/PluginBufferingAdapter.cpp
--- a/src/vamp-hostsdk/PluginBufferingAdapter.cpp Fri Mar 28 13:11:26 2014 +0000
+++ b/src/vamp-hostsdk/PluginBufferingAdapter.cpp Fri Mar 28 13:13:08 2014 +0000
@@ -617,11 +617,11 @@
double secs = feature.timestamp.sec;
secs += feature.timestamp.nsec / 1e9;
m_fixedRateFeatureNos[outputNo] =
- int(secs * m_outputs[outputNo].sampleRate + 0.5);
+ int(secs * double(m_outputs[outputNo].sampleRate) + 0.5);
}
feature.timestamp = RealTime::fromSeconds
- (m_fixedRateFeatureNos[outputNo] / m_outputs[outputNo].sampleRate);
+ (m_fixedRateFeatureNos[outputNo] / double(m_outputs[outputNo].sampleRate));
feature.hasTimestamp = true;
diff -r b4e9da4c2c69 -r 2741e4323d1d src/vamp-hostsdk/PluginInputDomainAdapter.cpp
--- a/src/vamp-hostsdk/PluginInputDomainAdapter.cpp Fri Mar 28 13:11:26 2014 +0000
+++ b/src/vamp-hostsdk/PluginInputDomainAdapter.cpp Fri Mar 28 13:13:08 2014 +0000
@@ -69,6 +69,7 @@
*/
#ifdef HAVE_FFTW3
#include
+#warning "Compiling with FFTW3 support will result in a GPL binary"
#else
#include "../vamp-sdk/FFTimpl.cpp"
#endif
diff -r b4e9da4c2c69 -r 2741e4323d1d vamp-sdk/Plugin.h
--- a/vamp-sdk/Plugin.h Fri Mar 28 13:11:26 2014 +0000
+++ b/vamp-sdk/Plugin.h Fri Mar 28 13:13:08 2014 +0000
@@ -321,7 +321,7 @@
OutputDescriptor() : // defaults for mandatory non-class-type members
hasFixedBinCount(false), hasKnownExtents(false), isQuantized(false),
- sampleType(OneSamplePerStep), hasDuration(false) { }
+ sampleType(OneSamplePerStep), sampleRate(0), hasDuration(false) { }
};
typedef std::vector OutputList;