diff testApp.h @ 47:0d3a993405e4

trying rto stop duplictae symbols

--- a/testApp.h	Wed Apr 24 17:58:08 2013 +0100
+++ b/testApp.h	Wed May 01 16:47:11 2013 +0100
@@ -5,11 +5,10 @@
 #include "ofxiPhoneExtras.h"
 #include "ofxiPhoneExternalDisplay.h"
 #include "ofxOsc.h"
-#include "ofxMidi.h"
+#import "ofxMidi.h"
 
 #include "grid.h"
 #include "2dvector.h"
-#include "ofxUI.h"
 #include "eventLogger.h"
 #include "AppCore.h"
 
@@ -28,6 +27,7 @@
 #import "SliderViewController.h"
 #import "usernameAlertViewController.h"
 #import "TimedSessionController.h"
+
 #define OSC_HOST "169.254.1.1"
 #define OSC_PORT 12345
 
@@ -35,12 +35,13 @@
 #define SLIDER_HEIGHT 256
 #define NUM_PARAMS 10
 
-typedef enum {SLIDERS,ZOOMER,BOTH,INTRO,QUESTIONNAIRE, HELP}interfaceType;
+
 
 class testApp : public ofxiPhoneApp , public ofxiPhoneExternalDisplay, public ofxMidiListener, public ofxMidiConnectionListener {
 
 	
 public:
+    typedef enum {SLIDERS,ZOOMER,BOTH,INTRO,QUESTIONNAIRE, HELP}interfaceType;
     bool sendMIDIAndOSC;
     int midiChannel;
     int midiOffset;
@@ -71,8 +72,6 @@
     
     TwoVector moveVel; // velocity at which we were moving the grid
     
-    vector <ofxUISlider *> sliders;
-    
     double slowFactor;
     double zoomVel; // do the same
      double prevZoom, prevZoom2;
@@ -148,17 +147,14 @@
     void topGuiEvent();
     
     // stardard GUI - knbs and sliders - hides zoomer
-    void sliderGUIEvent(ofxUIEventArgs &e);
-    void setupSliderGui();
-    ofxUICanvas *sliderGUI;
+
     
     void sliderMoved(int which, float value);
     void setAllGUISliders(vector<int> vals);
     void randomise();
     
     // zoom gui - the swap view button and save preset button
-    void zoomGUIEvent(ofxUIEventArgs &e);
-    void setupZoomGui();
+
     
 
     void sendParametersToPD();
@@ -178,7 +174,6 @@
     
     void sendMidiParams();
     void sendMidiParam(int which);
-    ofxUICanvas *zoomGUI;
     
     // audio callbacks
 	void audioReceived(float * input, int bufferSize, int nChannels);