summaryrefslogtreecommitdiff
path: root/liveengineUnmapped/src/testApp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'liveengineUnmapped/src/testApp.cpp')
-rwxr-xr-xliveengineUnmapped/src/testApp.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/liveengineUnmapped/src/testApp.cpp b/liveengineUnmapped/src/testApp.cpp
index 260b242..1132718 100755
--- a/liveengineUnmapped/src/testApp.cpp
+++ b/liveengineUnmapped/src/testApp.cpp
@@ -1,4 +1,5 @@
#include "testApp.h"
+
previewWindow::~previewWindow(){
cout << "preview window destroyed" << endl;
}
@@ -235,7 +236,7 @@ void testApp::keyPressed(int key, ofxFenster* win){
}
void testApp::keyPressed(int key){
if(key =='q'){
- nmidiMessage(144,ofRandom(64)+36,127);
+ nmidiMessage(144,127,ofRandom(64)+36);
}
if(key == 's'){
XML.saveFile("settings.xml");
@@ -393,17 +394,18 @@ void testApp::newMidiMessage(ofxMidiMessage& eventArgs){
//printf("%d %d %d %d %d\n",eventArgs.port,eventArgs.channel,eventArgs.status,eventArgs.byteOne,eventArgs.byteTwo);
void testApp::nmidiMessage(int event,int data1, int data2) {
- if (debug) printf("midi: %i %i\n",event,data1);
+ //printf("midi: %i %i\n",event,data1);
bool noteOn; //this old thing!
int i;
switch(event) {
case 144: //noteon-off channel 0
- noteOn=(data2==0?false:true);
+ //printf("note %i %i %i\n",event,data1,data2);
+ noteOn=(data1==0?false:true);
//for (int i=0;i<numLayers;i++){
// if (layers[i]->note==eventArgs.byteOne) layers[i]->setActive(noteOn);
//}
- note=data1;
+ note=data2;
lastnoteTime=ofGetElapsedTimef();
if (list.layers.size()&&list.lock()) { //if playlist is loaded
map<int, layer*>::iterator itr;