diff TrainingMessageOrganiser.h @ 11:91c3fba6e5b9

things can register for pd metronome events onTick gets back to search message organiser
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Mon, 20 Oct 2014 11:23:55 +0100
parents e25d2b1b185e
children af71bf84660f
line wrap: on
line diff
--- a/TrainingMessageOrganiser.h	Fri Oct 17 19:23:30 2014 +0100
+++ b/TrainingMessageOrganiser.h	Mon Oct 20 11:23:55 2014 +0100
@@ -13,7 +13,7 @@
 #include "trainingTestController.h"
 #include "MessageOrganiser.h"
 #include "SequenceController.h"
-
+#include "globalVariables.h"
 extern ExplorePresetManager expPresetManager;
 
 class TrainingMessageOrganiser : public MessageOrganiser {
@@ -23,9 +23,12 @@
         trainingTestController = new TrainingTestController;
         
         MessageOrganiser::init(cs,ts);
+        
+        TickListenerFunction callback;
+        callback = boost::bind(&TrainingMessageOrganiser::onNextTick, this, _1);
+        candidateSynth.registerForTicks(callback);
+    }
 
-    }
-    
     void setupDefaultMapping(){
         vector<int> mappingIDsForChangeableParams = getMappingIDsFromSynths();
         
@@ -58,6 +61,8 @@
     };
     
     void onNextTick(int tickNumber){
+        cout << "TICK " << tickNumber << endl;
+        
         if ( tickNumber % 2){
             // load next target preset
             int i = sequenceController.getNextPresetIndex();
@@ -161,6 +166,7 @@
         if (mappingID == TRIGGER_CANDIDATE_ID){
             triggerCandidateSound();
             // compare to target
+            candidateSynth.startMetronome();
             return;
         }
         if(mappingID == SAVE_PRESET_HIT){