comparison testApp.h @ 47:0d3a993405e4

trying rto stop duplictae symbols

 #include "ofMain.h"
 #include "ofxiPhone.h"
 #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"
 
 #include "presetManager.h"
 #include "eventLogger.h"

 #import "HelpViewController.h"
 #import "TopButtonViewController.h"
 #import "SliderViewController.h"
 #import "usernameAlertViewController.h"
 #import "TimedSessionController.h"
+
 #define OSC_HOST "169.254.1.1"
 #define OSC_PORT 12345
 
 #define SLIDER_GUI_WIDTH 256
 #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;
     bool animatingGrid;
     bool allowAnimation;

     bool xLocked, yLocked;
     unsigned int lastMoveTime;
     
     TwoVector moveVel; // velocity at which we were moving the grid
     
-    vector <ofxUISlider *> sliders;
-    
     double slowFactor;
     double zoomVel; // do the same
      double prevZoom, prevZoom2;
      TwoVector move, prevMove, prevMove2;
     

     void bottomGuiEvent();
     void setupTopGui();
     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();
     void sendOscShape(int ctrlin);
     void sendFiltShape(int ctrlin);

     void sendRevAmt(int ctrlin);
     void sendFiltEnvModAmt(int ctrlin);
     
     void sendMidiParams();
     void sendMidiParam(int which);
-    ofxUICanvas *zoomGUI;
     
     // audio callbacks
 	void audioReceived(float * input, int bufferSize, int nChannels);
 	void audioRequested(float * output, int bufferSize, int nChannels);