diff testApp.h @ 27:ae4d2c3ce5e0

Details. Zoom trailing finger move sorted. Qs rephrased.

--- a/testApp.h	Fri Feb 01 18:31:43 2013 +0000
+++ b/testApp.h	Wed Feb 13 17:03:56 2013 +0000
@@ -21,6 +21,7 @@
 #import "QuestionnaireViewController.h"
 #import "BottomTabViewController.h"
 #import "IntroViewController.h"
+#import "HelpViewController.h"
 #import "TopButtonViewController.h"
 #import "SliderViewController.h"
 #import "usernameAlertViewController.h"
@@ -39,6 +40,11 @@
     BottomTabViewController *bottomTabViewController;
     UsernameAlertViewController *usernameAlertViewController;
     HelpViewController *helpViewController;
+    QuestionnaireViewController * questionnaireViewController;
+    IntroViewController * introViewController;
+    TopButtonViewController * topButtonViewController;
+    SliderViewController * sliderViewController;
+    
     int prevTouchX;
     int prevTouchY;
     double prevDist;
@@ -65,11 +71,9 @@
     vector<int> freqIndexes;
     
     int numActiveTouches;
-    
-    QuestionnaireViewController * questionnaireViewController;
-    IntroViewController * introViewController;
-    TopButtonViewController * topButtonViewController;
-    SliderViewController * sliderViewController;
+    bool preventingMovePostScroll;
+
+
     //
     
     void setup();
@@ -99,6 +103,8 @@
     ofxOscSender sender;
     void sendOSCParams();
     
+    void setupNewUser();
+    
     void lockSynthPressed(bool locked);
     void lockSequencerPressed(bool locked);
     
@@ -108,6 +114,8 @@
     void introHidden(bool OK);
     void interfaceSelected(int which);
     void seqStartStop(bool go);
+    void showHelp();
+    void helpHidden();
     
     void setupBottomGui();
     void bottomGuiEvent();