comparison src/Voice.cpp @ 13:9e31c0507e65

Added amplitude control (keys '*' and '/').

  *
  */
 
 #include "Voice.h"
 
+inline static double min(double x,double y) { return (x<y) ? x : y; }
+
 Voice::Voice(int id, int x, int y){
 	this->id=id;
 	posx=x;
 	posy=y;
 	isActive=true;
 	radius=12;
 	inTriangle=false;
 	octave=0;
 	highlight=false;
+	amplitude=0.6;
 }
-
-Voice::Voice(){}
 
 void Voice::draw(){
 	ofSetColor(200,0,0);
 	
 	if (isActive){

 	if (highlight) ofSetColor(255, 192, 192);
 	ofNoFill();
 	ofCircle(posx, posy, radius);
 }
 
-bool Voice::isInVoice(int x, int y){
-	if (ofDist(x, y, posx, posy)<=radius){
-		return true;
-	}else {
-		return false;
-	}
+double Voice::louder()  { return amplitude=min(1,amplitude*1.125); }
+double Voice::quieter() { return amplitude/=1.125; }
 
-}
-