Mercurial > hg > qm-vamp-plugins

changeset 203:811820a78dbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 06 Feb 2018 21:13:25 +0000
parents 18712d653873 (diff) 354eee78b9fc (current diff)
children d58db4544b9b
files
diffstat 4 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/build/msvc/QMVampPlugins.vcxproj	Tue Feb 06 13:12:11 2018 +0000
+++ b/build/msvc/QMVampPlugins.vcxproj	Tue Feb 06 21:13:25 2018 +0000
@@ -64,6 +64,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>qm-vamp-plugins</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -85,7 +86,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>$(ProjectDir)..\mingw32\atlas.lib;$(ProjectDir)..\mingw32\cblas.lib;$(ProjectDir)..\mingw32\lapack.lib;$(ProjectDir)..\mingw32\f77blas.lib;$(ProjectDir)..\mingw32\g2cstubs.lib;$(ProjectDir)\no-vprintf.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\qm-dsp.lib;$(ProjectDir)\lib32\atlas.lib;$(ProjectDir)\lib32\cblas.lib;$(ProjectDir)\lib32\lapack.lib;$(ProjectDir)\lib32\f77blas.lib;$(ProjectDir)\lib32\g2cstubs.lib;$(ProjectDir)\lib32\no-vprintf.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/EXPORT:vampGetPluginDescriptor %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
--- a/plugins/ChromagramPlugin.cpp	Tue Feb 06 13:12:11 2018 +0000
+++ b/plugins/ChromagramPlugin.cpp	Tue Feb 06 21:13:25 2018 +0000
@@ -216,6 +216,11 @@
     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) return false;
 
+    if (m_inputSampleRate > 384000) {
+        std::cerr << "ChromagramPlugin::initialise: Maximum input sample rate is 384000" << std::endl;
+        return false;
+    }
+
     m_chromagram = new Chromagram(m_config);
     m_binsums = vector<double>(m_config.BPO);
 
--- a/plugins/ConstantQSpectrogram.cpp	Tue Feb 06 13:12:11 2018 +0000
+++ b/plugins/ConstantQSpectrogram.cpp	Tue Feb 06 21:13:25 2018 +0000
@@ -213,6 +213,11 @@
     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) return false;
 
+    if (m_inputSampleRate > 384000) {
+        std::cerr << "ConstantQSpectrogram::initialise: Maximum input sample rate is 384000" << std::endl;
+        return false;
+    }
+
     setupConfig();
 
     m_cq = new ConstantQ(m_config);
--- a/vext-lock.json	Tue Feb 06 13:12:11 2018 +0000
+++ b/vext-lock.json	Tue Feb 06 21:13:25 2018 +0000
@@ -4,7 +4,7 @@
       "pin": "13e551657422"
     },
     "qm-dsp": {
-      "pin": "254313f0ef9b"
+      "pin": "eee235c4f962"
     }
   }
 }