diff testApp.h @ 3:43df75088d85

fixed sticking scroll
more file fiddling

--- a/testApp.h	Tue Nov 27 15:34:51 2012 +0000
+++ b/testApp.h	Mon Dec 03 18:29:07 2012 +0000
@@ -10,14 +10,20 @@
 #include "eventLogger.h"
 #include "AppCore.h"
 
+#include "presetManager.h"
+#include "eventLogger.h"
+#include "ofxPd.h"
+#include "frequencer.h"
+
 #define HOST "169.254.1.1"
 #define PORT 12345
 
 class testApp : public ofxiPhoneApp {
 
-	public:
+	
+public:
     
-    
+
     int prevTouchX;
     int prevTouchY;
     double prevDist;
@@ -40,6 +46,7 @@
      TwoVector prevMove, prevMove2;
     
     vector<int> sliderVals;
+    vector<int> freqIndexes;
     
     int numActiveTouches;
     
@@ -80,8 +87,15 @@
     void zoomGUIEvent(ofxUIEventArgs &e);
     void setupZoomGui();
     
-    void updateSliderValue(int which, float value);
-    void setGUISliders(vector<int> vals);
+    void sliderMoved(int which, float value);
+    void setAllGUISliders(vector<int> vals);
+    void sendParametersToPD();
+    void sendOscShape(int ctrlin);
+    void sendFiltShape(int ctrlin);
+    void sendFiltType(int ctrlin);
+    void sendFiltFreq(int ctrlin);
+    void sendEnvShape(int ctrlin);
+    void sendModFreq(int ctrlin);
     
     ofxUICanvas *zoomGUI;