Mercurial > hg > soniczoomios

diff testApp.h @ 46:1e266647840d
beta 2. interpolation movement , smoothing (crap) and timbre only.
author: Robert Tubb <rt300@eecs.qmul.ac.uk>
date: Wed, 24 Apr 2013 17:58:08 +0100
parents: c2fffc8ea84d
children: 0d3a993405e4
--- a/testApp.h	Tue Apr 23 18:29:55 2013 +0100
+++ b/testApp.h	Wed Apr 24 17:58:08 2013 +0100
@@ -44,8 +44,10 @@
     bool sendMIDIAndOSC;
     int midiChannel;
     int midiOffset;
-    
+    bool animatingGrid;
+    bool allowAnimation;
     interfaceType whichInterfaceShowing;
+    interfaceType previousInterface;
     BottomTabViewController *bottomTabViewController;
     UsernameAlertViewController *usernameAlertViewController;
     HelpViewController *helpViewController;
@@ -96,7 +98,6 @@
     void initialiseGUIs();
     void initialiseMIDI();
 
-    
     float getWidth();
     float getHeight();
     
@@ -139,7 +140,7 @@
     // shortcut function for testing
     void justStart();
     void loadSequences();
-    void nextSequence();
+    int nextSequence();
     
     void setupBottomGui();
     void bottomGuiEvent();