comparison BeatRootProcessor.h @ 6:02d388f98c23

Introduce a number of new classes derived from the Java

 
 #ifndef _BEATROOT_PROCESSOR_H_
 #define _BEATROOT_PROCESSOR_H_
 
 #include "Peaks.h"
+#include "Event.h"
+#include "BeatTracker.h"
 
 #include <vector>
 #include <cmath>
 
 using std::vector;

     /** The estimated onset times from peak-picking the onset
      * detection function(s). */
     vector<double> onsets;
 	
     /** The estimated onset times and their saliences. */	
-    //!!!EventList onsetList;
-    vector<double> onsetList; //!!! corresponding to keyDown member of events in list
+    EventList onsetList;
 
     /** Total number of audio frames if known, or -1 for live or compressed input. */
     int totalFrames;
 	
     /** Flag for enabling or disabling debugging output */

         Peaks::normalise(spectralFlux);
         vector<int> peaks = Peaks::findPeaks(spectralFlux, (int)lrint(0.06 / hop), 0.35, 0.84, true);
         onsets.clear();
         onsets.resize(peaks.size(), 0);
         vector<int>::iterator it = peaks.begin();
-        onsetList = new EventList();
-        double minSalience = Peaks.min(spectralFlux);
-        for (int i = 0; i < onsets.length; i++) {
+        onsetList.clear();
+        double minSalience = Peaks::min(spectralFlux);
+        for (int i = 0; i < onsets.size(); i++) {
             int index = *it;
             ++it;
             onsets[i] = index * hop;
-            Event e = BeatTrackDisplay.newBeat(onsets[i], 0);
+            Event e = BeatTracker::newBeat(onsets[i], 0);
 //			if (debug)
 //				System.err.printf("Onset: %8.3f  %8.3f  %8.3f\n",
 //						onsets[i], energy[index], slope[index]);
 //			e.salience = slope[index];	// or combination of energy + slope??
             // Note that salience must be non-negative or the beat tracking system fails!
             e.salience = spectralFlux[index] - minSalience;
-            onsetList.add(e);
+            onsetList.push_back(e);
         }
 
         //!!! This onsetList is then fed in to BeatTrackDisplay::beatTrack
 
     } // processFile()