changeset 50:45ba1627d802

* Added m_cyclicTempogramReferenceBPM to initialiser list
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Tue, 30 Sep 2014 15:00:23 +0100
parents b27e42b68c61
children c7cc649dc9b6
files TempogramPlugin.cpp
diffstat 1 files changed, 1 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/TempogramPlugin.cpp	Tue Sep 30 14:44:39 2014 +0100
+++ b/TempogramPlugin.cpp	Tue Sep 30 15:00:23 2014 +0100
@@ -40,7 +40,7 @@
     m_cyclicTempogramMinBPM(30), //reset in initialise()
     m_cyclicTempogramNumberOfOctaves(0), //set in initialise()
     m_cyclicTempogramOctaveDivider(30), //parameter
-    m_cyclicTempogramReferenceBPM(60)
+    m_cyclicTempogramReferenceBPM(60) //parameter
 
     // Also be sure to set your plugin parameters (presumably stored
     // in member variables) to their default values here -- the host
@@ -239,18 +239,6 @@
     d8.isQuantized = true;
     d8.quantizeStep = 1;
     list.push_back(d8);
-    
-    ParameterDescriptor d9;
-    d9.identifier = "refBPM";
-    d9.name = "Cyclic Tempogram Reference BPM";
-    d9.description = "The reference BPM used when calculating the parameter \'s\' of the cyclic tempogram.";
-    d9.unit = "";
-    d9.minValue = 30;
-    d9.maxValue = 240;
-    d9.defaultValue = 60;
-    d9.isQuantized = true;
-    d9.quantizeStep = 1;
-    list.push_back(d9);
 
     return list;
 }
@@ -282,9 +270,6 @@
     else if (identifier == "octDiv"){
         return m_cyclicTempogramOctaveDivider;
     }
-    else if (identifier == "refBPM"){
-        return m_cyclicTempogramReferenceBPM;
-    }
     
     return 0;
 }
@@ -317,9 +302,6 @@
     else if (identifier == "octDiv"){
         m_cyclicTempogramOctaveDivider = value;
     }
-    else if (identifier == "refBPM"){
-        m_cyclicTempogramReferenceBPM = value;
-    }
     
 }
 
@@ -367,14 +349,6 @@
     d1.sampleType = OutputDescriptor::FixedSampleRate;
     d_sampleRate = tempogramInputSampleRate/m_tempogramHopSize;
     d1.sampleRate = d_sampleRate > 0.0 && !isnan(d_sampleRate) ? d_sampleRate : 0;
-    vector< vector<unsigned int> > logBins = calculateTempogramNearestNeighbourLogBins();
-    if (!logBins.empty()){
-        //assert((int)logBins[0].size() == m_cyclicTempogramOctaveDivider);
-        for(int i = 0; i < (int)m_cyclicTempogramOctaveDivider; i++){
-            //float s = binToBPM(logBins[0][i])/m_cyclicTempogramReferenceBPM;
-            //d1.binNames.push_back(floatToString(s));
-        }
-    }
     d1.hasDuration = false;
     list.push_back(d1);