started GLFW version

3 files changed, 13 insertions, 9 deletions

diff --git a/liveengineUnmapped/src/main.cpp b/liveengineUnmapped/src/main.cpp
index cb2b5b2..df825c8 100755
--- a/liveengineUnmapped/src/main.cpp
+++ b/liveengineUnmapped/src/main.cpp
@@ -7,8 +7,8 @@
 int main( ){
 
     ofAppGlutWindow window;
-    ofSetupOpenGL(ofxFensterManager::get(),1440,270, OF_WINDOW); //480x270
-	//ofSetupOpenGL(ofxFensterManager::get(),4080,768, OF_WINDOW); //2048,768
+    //ofSetupOpenGL(ofxFensterManager::get(),1440,270, OF_WINDOW); //480x270
+	ofSetupOpenGL(ofxFensterManager::get(),4080,768, OF_WINDOW); //2048,768
 	//ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
 	//ofSetupOpenGL(&window, 1024,768, OF_WINDOW);
 
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;
diff --git a/liveengineUnmapped/src/testApp.h b/liveengineUnmapped/src/testApp.h
index 9dd9b62..b6c9ac6 100755
--- a/liveengineUnmapped/src/testApp.h
+++ b/liveengineUnmapped/src/testApp.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef TESTAPP_H
+#define TESTAPP_H
 
 //#include <GL/glxew.h>
 
@@ -95,7 +96,7 @@ class guiWindow;
 
 //#define GRAB_TEXTURE
 
-class testApp : public ofxFensterListener, public ofxMidiListener{
+class ofApp : public ofxMidiListener, public ofxFensterListener{
 
 	public:
 
@@ -202,7 +203,7 @@ public:
 	~previewWindow();
 	ofFbo *rb;
 	testApp *parent;
-	void setParent(testApp *p);
+	void setParent(ofApp *p);
 	void setup();
 	void setBuffer(ofFbo *buffer);
 	void draw();
@@ -221,3 +222,4 @@ public:
 };
 
 
+#endif
\ No newline at end of file