comparison src/Voice.h @ 25:f4ebb87adec1

Added code to keep track of true position of voices in information space;
Two voice drawing methods display both true position target position while dragging;
string to Voice::status code no longer required;
refactored OSC message sending code;
added keys to control subdivision ratio for period and shift controls.

 		pending,
 		waiting,
 		moved
 	};
 
-	class bad_status : public std::exception {
-		string str;
-	public:
-		bad_status(string s): str(s) {}
-		~bad_status() throw() {}
-		const char *what() const throw();
-	};
-		
-	static status stringToStatus(string str) throw(bad_status);
 	bool isInVoice(int x, int y) { return (ofDist(x, y, posx, posy)<=RADIUS); };
 	//void setPos(int x, int y) { posx=x; posy=y; status=pending; }
 	double louder();
 	double quieter();
 	void   draw(bool highlight);
+	void   draw_alt(bool highlight);
 	
-	int id;
-	int posx,posy;
-	bool isActive;
-	bool inTriangle;
-	int octave;
+	int    id;
+	int    posx,posy;
+	bool   isActive;
+	bool   inTriangle;
+	int    octave;
 	double amplitude;
-	enum status status;
+	enum   status status;
+	float  truex, truey;
 };