Mercurial > hg > screen-ui

diff src/melodyTriangle.h @ 38:330f2746fedd tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added keys help in a smaller font; changed loadness keyboard controls.
author samer
date Mon, 27 Feb 2012 20:09:10 +0000
parents 260cc4f4d70a
children
line wrap: on
line diff
--- a/src/melodyTriangle.h	Wed Feb 22 00:30:20 2012 +0000
+++ b/src/melodyTriangle.h	Mon Feb 27 20:09:10 2012 +0000
@@ -53,6 +53,7 @@
 	bool clipToTriangle(int *cx, int *cy);
 	void fitTriangleIn(int w, int h);
 	void reset();
+	string help_string(bool global);
 
 	// Immutable after construction and setup
 	ofxOscSender	sender;
@@ -72,9 +73,11 @@
 	bool   allowExit;
 	bool   snapTruePos;
 	bool   randInit;
-	int    display_frames;
 	int    ratio;
 	int	   tempoIndex;
+	int    display_frames;
 	string display_msg;
-	ofTrueTypeFont display_font;
+	ofTrueTypeFont *display_font;
+	ofTrueTypeFont help_font;
+	ofTrueTypeFont main_font;
 };