diff testApp.h @ 9:d5e928887f51

More refactoring.
Mode for Synth value changes only sent to PD on triggering sound.

--- a/testApp.h	Fri Oct 17 16:35:22 2014 +0100
+++ b/testApp.h	Fri Oct 17 17:50:41 2014 +0100
@@ -30,7 +30,6 @@
 #include "MessageOrganiser.h"
 #include "SearchMessageOrganiser.h"
 #include "TrainingMessageOrganiser.h"
-#include "TestController.h"
 #include "timeController.h"
 #include <buttonPanel.h>
 #include "targetSymbol.h"
@@ -50,6 +49,8 @@
 	
 public:
 
+    testStages currentStage;
+    
     ofTrueTypeFont verdBig;
     bool sendMIDIAndOSC;
     bool paused;
@@ -84,8 +85,7 @@
     
     PDSynthWrapper targetSynth;
     PDSynthWrapper candidateSynth;
-    
-    TestController* testController;
+
     //TimeController timeController;
     interfaceType whichInterfaceShowing, previousInterface;
     
@@ -117,7 +117,8 @@
     void showIntro();
     void introHidden();
     void usernameEntered();
-    void startTheTests();
+    void startTheSearchTests();
+    void startTheTrainingTests();
     void showHelp();
     void helpHidden();
     void setupNewUser();