comparison src/melodyTriangle.cpp @ 30:9e8c19c90986

Added visual confirmation on keyboard enable/disable.

 
 static int tempi[]={20,30,45,60,90,120,150,180};
 
 melodyTriangle::melodyTriangle(const char *host, int port, int numVoices, 
 							   bool enableKeys,int voiceIdOffset,int receivePort): 
-	numVoices(numVoices), enableKeys(enableKeys), receivePort(receivePort),
-	display_msg(""), display_frames(0), ratio(2), tempoIndex(4)
+	numVoices(numVoices), receivePort(receivePort),
+	enableKeys(enableKeys), allowExit(true), ratio(2), tempoIndex(4),
+	display_msg(""), display_frames(0)
 {
-	printf("in constructor: %s %i %i %i %i %i\n",
-		   host,port,numVoices,enableKeys,voiceIdOffset,receivePort);
 	for (int i=0;i<numVoices;i++) voices[i]=new Voice(i+1+voiceIdOffset);
 	
 	sender.setup( host,port );
 	receiver.setup( receivePort );
 	display_font.loadFont("/System/Library/Fonts/LucidaGrande.ttc",24);

 			
 			if (vg->inTriangle) {
 				
 				if (clipped) {
 					// check how far we clipped
-					if (ofDist(clipx, clipy, mouseX, mouseY) > BUFFER_ZONE) { 
+					if (ofDist(clipx, clipy, mouseX, mouseY)>BUFFER_ZONE && allowExit) { 
 						// if far enough, we pop out of triangle and send
 						send("/death",vg->id);
 						vg->posx=mouseX;
 						vg->posy=mouseY;
 						vg->inTriangle=false;

 				case 'S': send("/save"); break;
 				case 'C': sendReplyTo(); sendCalibrate(); break;
 				case 'F': ofToggleFullscreen(); break;
 				case 'R': reset(); break;
 				case 'Q': ofAppGlutWindow::exitApp();
+				case OF_KEY_ESC: setKeyboardEnable(false); break;
 
 				default: // otherwise, send key to all voices under mouse
 					for (int i=0; i<numVoices; i++)
 						if (voices[i]->isInVoice(mouseX,mouseY)) 
 							voiceKeypress(voices[i],key);
 			}
 		}
-	} else send("/key",key);
+	} else {
+		if (key==OF_KEY_ESC) setKeyboardEnable(true);
+		else send("/key",key);
+	}
 }
 
 void melodyTriangle::voiceKeypress(Voice *v, int key) {
 	switch (key) {
 		case 'a':

 		v->posx=x2+RADIUS+(numVoices-1-i)*36;
 		v->posy=48;
 		v->status=Voice::pending;
 		v->isActive=true;
 		if (v->inTriangle) {
-			send("/death",voices[i]->id);
+			send("/death",v->id);
 			v->inTriangle=false;
 		}
 	}
 }
 
 // OSC Message handling -----------------------------------------
 
 Voice *melodyTriangle::get_voice(int id) throw(bad_voice_id) {
-	if (id<1 || id>numVoices) throw bad_voice_id(id);
-	return voices[id-1];
+	for (int i=0; i<numVoices; i++) {
+		if (voices[i]->id==id) return voices[i];
+	}
+	throw bad_voice_id(id);
 }
 
 void melodyTriangle::handleMessage(ofxOscMessage &m) {
 	string msg_path=m.getAddress();
 

 		} else if (msg_path=="/display") {
 			display_msg=m.getArgAsString(0);
 			display_frames=m.getArgAsInt32(1);
 		} else if (msg_path=="/font") {
 			display_font.loadFont(m.getArgAsString(0),m.getArgAsInt32(1));
-		} else if (msg_path=="/keyboard") { enableKeys=m.getArgAsInt32(0); }
+		} else if (msg_path=="/keyboard") { setKeyboardEnable(m.getArgAsInt32(0)); }
 		else if (msg_path=="/reset")	  { reset(); } 
 		else if (msg_path=="/fullscreen") { ofSetFullscreen(m.getArgAsInt32(0)); }
 		else if (msg_path=="/quit")		  { ofAppGlutWindow::exitApp(); } 
+		else if (msg_path=="/allowExit")  { allowExit=m.getArgAsInt32(0); }
 		else {
 			cout << m.getAddress();
 			for (int i=0; i<m.getNumArgs(); i++) {
 				cout << " " << m.getArgTypeName(i) << ":";
 				switch (m.getArgType(i)) {

 	} catch (std::exception &ex) {
 		cout << "** Error processing OSC message: " << ex.what() << "\n";
 	}
 }
 
+void melodyTriangle::setKeyboardEnable(bool en) {
+	enableKeys=en;
+	display_msg=en ? "Keyboard enabled" : "Keybard disabled";
+	display_frames=40;
+}
+
 // OSC Message sending -----------------------------------------
 
 void melodyTriangle::sendPosition(Voice *v){
 	
 	ofxOscMessage m;

 }
 
 const char *melodyTriangle::bad_voice_id::what() const throw() { 
 	std::stringstream out;
 	printf("bad_voice_id(%d).\n",id);
-	out << "Voice id " << id <<" out of range.";
+	out << "Voice id " << id <<" not present.";
 	return out.str().c_str();
 }