Mercurial > hg > wabletios

diff testApp.h @ 15:d5758530a039 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oF0.84 Retina, and iPhone support
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Tue, 12 May 2015 15:48:52 +0100
parents 4ba81a12b008
children
line wrap: on
line diff
--- a/testApp.h	Mon Jul 14 16:26:30 2014 +0100
+++ b/testApp.h	Tue May 12 15:48:52 2015 +0100
@@ -1,13 +1,14 @@
-// oF 072
+// oF 084
+// V 1.3sonic
 
 #ifndef _TEST_APP
 #define _TEST_APP
 
 #include "ofMain.h"
-#include "ofxiPhone.h"
-#include "ofxiPhoneExtras.h"
-#include "ofxiPhoneExternalDisplay.h"
-#include "ofxiPhoneAppDelegate.h"
+
+
+#include "ofxiOS.h"
+#include "ofxiOSExtras.h"
 
 #include "2dvector.h"
 #include "lump.h"
@@ -36,7 +37,7 @@
 
 
 
-class testApp : public ofxiPhoneApp, public ofxiPhoneExternalDisplay, public ofxMidiListener, public ofxMidiConnectionListener {
+class testApp : public ofxiOSApp, public ofxMidiListener, public ofxMidiConnectionListener {
 	
 public:
     int timesOpened;
@@ -80,7 +81,8 @@
     void removeTouch();
     
     void UIcallBack(int buttID);
-
+    void showControls();
+    void hideControls();
    
 	void keyPressed  (int key);
 	void keyReleased(int key);