comparison testApp.h @ 8:d59de9fd3496

Refactored messageController, ready for instroduction of other stages and tests.

 #include "buttron.h"
 #include "ButtronSlider.h"
 #include "buttronXY.h"
 #include "UIGrid.h"
 #include "MessageOrganiser.h"
+#include "SearchMessageOrganiser.h"
+#include "TrainingMessageOrganiser.h"
 #include "TestController.h"
 #include "timeController.h"
 #include <buttonPanel.h>
 #include "targetSymbol.h"
 #include "3Dbox.h"

     HelpViewController *helpViewController;
     QuestionnaireViewController *questionnaireViewController;
     UsernameAlertViewController *usernameAlertViewController;
     IntroViewController * introViewController;
     
-    MessageOrganiser messageOrganiser;
+    SearchMessageOrganiser searchMessageOrganiser;
+    TrainingMessageOrganiser trainingMessageOrganiser;
+    
+    
+    PDSynthWrapper targetSynth;
+    PDSynthWrapper candidateSynth;
+    
     TestController* testController;
     //TimeController timeController;
     interfaceType whichInterfaceShowing, previousInterface;
     
     // various views