Mercurial > hg > qm-vamp-plugins

changeset 31:5cd7e3069553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* minor fixes, and remove DF_POWER again
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 03 Sep 2007 13:37:25 +0000
parents ff5a09e45209
children 8cde4a0f36ef
files plugins/BeatTrack.cpp plugins/OnsetDetect.cpp
diffstat 2 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/BeatTrack.cpp	Thu Aug 09 16:35:37 2007 +0000
+++ b/plugins/BeatTrack.cpp	Mon Sep 03 13:37:25 2007 +0000
@@ -100,7 +100,7 @@
     desc.name = "Onset Detection Function Type";
     desc.description = "Method used to calculate the onset detection function";
     desc.minValue = 0;
-    desc.maxValue = 3;
+    desc.maxValue = 4;
     desc.defaultValue = 3;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
@@ -136,7 +136,6 @@
         case DF_PHASEDEV: return 2;
         default: case DF_COMPLEXSD: return 3;
         case DF_BROADBAND: return 4;
-        case DF_POWER: return 5;
         }
     } else if (name == "whiten") {
         return m_whiten ? 1.0 : 0.0; 
@@ -154,7 +153,6 @@
         case 2: m_dfType = DF_PHASEDEV; break;
         default: case 3: m_dfType = DF_COMPLEXSD; break;
         case 4: m_dfType = DF_BROADBAND; break;
-        case 5: m_dfType = DF_POWER; break;
         }
     } else if (name == "whiten") {
         m_whiten = (value > 0.5);
@@ -258,6 +256,8 @@
     tempo.unit = "bpm";
     tempo.hasFixedBinCount = true;
     tempo.binCount = 1;
+    tempo.hasKnownExtents = false;
+    tempo.isQuantized = false;
     tempo.sampleType = OutputDescriptor::VariableSampleRate;
     tempo.sampleRate = 1.0 / m_stepSecs;
 
--- a/plugins/OnsetDetect.cpp	Thu Aug 09 16:35:37 2007 +0000
+++ b/plugins/OnsetDetect.cpp	Mon Sep 03 13:37:25 2007 +0000
@@ -101,7 +101,7 @@
     desc.name = "Onset Detection Function Type";
     desc.description = "Method used to calculate the onset detection function";
     desc.minValue = 0;
-    desc.maxValue = 3;
+    desc.maxValue = 4;
     desc.defaultValue = 3;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
@@ -110,7 +110,6 @@
     desc.valueNames.push_back("Phase Deviation");
     desc.valueNames.push_back("Complex Domain");
     desc.valueNames.push_back("Broadband Energy Rise");
-    desc.valueNames.push_back("Spectral Magnitude");
     list.push_back(desc);
 
     desc.identifier = "sensitivity";
@@ -149,7 +148,6 @@
         case DF_PHASEDEV: return 2;
         default: case DF_COMPLEXSD: return 3;
         case DF_BROADBAND: return 4;
-        case DF_POWER: return 5;
         }
     } else if (name == "sensitivity") {
         return m_sensitivity;
@@ -170,7 +168,6 @@
         case 2: dfType = DF_PHASEDEV; break;
         default: case 3: dfType = DF_COMPLEXSD; break;
         case 4: dfType = DF_BROADBAND; break;
-        case 5: dfType = DF_POWER; break;
         }
         if (dfType == m_dfType) return;
         m_dfType = dfType;
@@ -212,9 +209,9 @@
         setParameter("sensitivity", 50);
         setParameter("whiten", 0);
     } else if (program == "Soft onsets") {
-        setParameter("dftype", 2); // phase deviation
-        setParameter("sensitivity", 70);
-        setParameter("whiten", 0);
+        setParameter("dftype", 3); // complex
+        setParameter("sensitivity", 40);
+        setParameter("whiten", 1);
     } else if (program == "Percussive onsets") {
         setParameter("dftype", 4); // broadband energy rise
         setParameter("sensitivity", 40);