diff src/Voice.h @ 13:9e31c0507e65

Added amplitude control (keys '*' and '/').
author samer
date Mon, 30 Jan 2012 13:29:53 +0000
parents d879a30556f8
children 9a414ea6880d
line wrap: on
line diff
--- a/src/Voice.h	Mon Jan 30 00:00:15 2012 +0000
+++ b/src/Voice.h	Mon Jan 30 13:29:53 2012 +0000
@@ -9,11 +9,13 @@
 #include "ofMain.h"
 class Voice  {
 public:
+	Voice(int id, int x, int y);
+	Voice() {};
 	
-	void draw();
-	Voice(int id, int x, int y);
-	Voice();
-	bool isInVoice(int x, int y);
+	bool isInVoice(int x, int y) { return (ofDist(x, y, posx, posy)<=radius); };
+	double louder();
+	double quieter();
+	void   draw();
 	
 	int id;
 	int posx,posy;
@@ -22,6 +24,5 @@
 	int radius;
 	int octave;
 	bool highlight;
-	
-	
+	double amplitude;
 };