comparison TempogramPlugin.cpp @ 49:b27e42b68c61

* Added reference tempo parameter for cyclic tempogram

     m_tempogramMaxBin(0), //set in initialise()
     m_tempogramMinLag(0), //set in initialise()
     m_tempogramMaxLag(0), //set in initialise()
     m_cyclicTempogramMinBPM(30), //reset in initialise()
     m_cyclicTempogramNumberOfOctaves(0), //set in initialise()
-    m_cyclicTempogramOctaveDivider(30) //parameter
+    m_cyclicTempogramOctaveDivider(30), //parameter
+    m_cyclicTempogramReferenceBPM(60)
 
     // Also be sure to set your plugin parameters (presumably stored
     // in member variables) to their default values here -- the host
     // will not do that for you
 {

     d8.maxValue = 60;
     d8.defaultValue = 30;
     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;
 }
 
 float

         return m_tempogramMaxBPM;
     }
     else if (identifier == "octDiv"){
         return m_cyclicTempogramOctaveDivider;
     }
+    else if (identifier == "refBPM"){
+        return m_cyclicTempogramReferenceBPM;
+    }
     
     return 0;
 }
 
 void

     else if (identifier == "maxBPM"){
         m_tempogramMaxBPM = value;
     }
     else if (identifier == "octDiv"){
         m_cyclicTempogramOctaveDivider = value;
+    }
+    else if (identifier == "refBPM"){
+        m_cyclicTempogramReferenceBPM = value;
     }
     
 }
 
 TempogramPlugin::ProgramList

     d1.hasKnownExtents = false;
     d1.isQuantized = false;
     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);
     
     OutputDescriptor d2;
     d2.identifier = "tempogramDFT";