diff testApp.h @ 24:a4908ad8c78e

Top and bottom toolbars. Intro page.

--- a/testApp.h	Fri Jan 25 17:42:47 2013 +0000
+++ b/testApp.h	Fri Feb 01 11:16:56 2013 +0000
@@ -19,16 +19,23 @@
 
 
 #import "QuestionnaireViewController.h"
+#import "BottomTabViewController.h"
+#import "IntroViewController.h"
+#import "TopButtonViewController.h"
 
 #define HOST "169.254.1.1"
 #define PORT 12345
 
+typedef enum {SLIDERS,ZOOMER,BOTH,INTRO,QUESTIONNAIRE}interfaceType;
+
 class testApp : public ofxiPhoneApp {
 
 	
 public:
     
-
+    interfaceType whichInterfaceShowing;
+    bool consentGiven;
+    BottomTabViewController *bottomTabViewController;
     int prevTouchX;
     int prevTouchY;
     double prevDist;
@@ -57,6 +64,9 @@
     int numActiveTouches;
     
     QuestionnaireViewController * questionnaireViewController;
+    IntroViewController * introViewController;
+    TopButtonViewController * topButtonViewController;
+    
     //
     
     void setup();
@@ -86,14 +96,26 @@
     ofxOscSender sender;
     void sendOSCParams();
     
+    void lockSynthPressed(bool locked);
+    void lockSequencerPressed(bool locked);
+    
     void showQuestionnaire();
     void questionnaireHidden(vector<int> answers);
+    void showIntro();
+    void introHidden(bool OK);
+    void interfaceSelected(int which);
+    void seqStartStop(bool go);
+    
+    void setupBottomGui();
+    void bottomGuiEvent();
+    void setupTopGui();
+    void topGuiEvent();
     
     // stardard GUI - knbs and sliders - hides zoomer
-    bool standardGUIShowing;
-    void standardGUIEvent(ofxUIEventArgs &e);
-    void setupStandardGui();
-    ofxUICanvas *standardGUI;
+    void sliderGUIEvent(ofxUIEventArgs &e);
+    void setupSliderGui();
+    ofxUICanvas *sliderGUI;
+    
     void sliderMoved(int which, float value);
     void setAllGUISliders(vector<int> vals);