comparison BeatTracker.cpp @ 23:633ec097fa56

Expose the processing parameters Simon suggests

   COPYING included with this distribution for more information.
 */
 
 #include "BeatTracker.h"
 
-EventList BeatTracker::beatTrack(EventList events, EventList beats)
+EventList BeatTracker::beatTrack(AgentParameters params,
+                                 EventList events, EventList beats)
 {
     AgentList agents;
     int count = 0;
     double beatTime = -1;
     if (!beats.empty()) {

 	--itr;
 	beatTime = itr->time;
     }
     if (count > 0) { // tempo given by mean of initial beats
 	double ioi = (beatTime - beats.begin()->time) / count;
-	agents.push_back(new Agent(ioi));
+	agents.push_back(new Agent(params, ioi));
     } else // tempo not given; use tempo induction
-	agents = Induction::beatInduction(events);
+	agents = Induction::beatInduction(params, events);
     if (!beats.empty())
 	for (AgentList::iterator itr = agents.begin(); itr != agents.end();
 	     ++itr) {
 	    (*itr)->beatTime = beatTime;
 	    (*itr)->beatCount = count;
 	    (*itr)->events = beats;
 	}
-    agents.beatTrack(events, -1);
+    agents.beatTrack(events, params, -1);
     Agent *best = agents.bestAgent();
     EventList results;
     if (best) {
 	best->fillBeats(beatTime);
 	results = best->events;