sorted bad window placement once and for all

1 files changed, 8 insertions, 4 deletions

diff --git a/liveengineUnmapped/src/testApp.cpp b/liveengineUnmapped/src/testApp.cpp
index 266ebb6..91359f8 100755
--- a/liveengineUnmapped/src/testApp.cpp
+++ b/liveengineUnmapped/src/testApp.cpp
@@ -74,6 +74,8 @@ void testApp::setup(){
 		}
 	}
 
+	 printf("screen %ix%i\n",ofGetHeight(),ofGetWidth());
+
 
 	midiIn.listPorts();
 	midiIn.openPort(midiPort);
@@ -139,12 +141,13 @@ void testApp::setup(){
 	win->addListener(prevWin);
 	prevWin->setup();
 	prevWin->setParent(this);
-	prevWin->setBuffer(&viewports[0]->rb2);
+	prevWin->setBuffer(&viewports[2]->rb2);
 
 	fullscreenoutput=false;
 
 	guiWin=new guiWindow();
 	gui.setup("","panel.xml",0,0);
+	gui.add(reverse.setup("reverse", false));
 	gui.add(reversemain.setup("reverse main", false));
 	gui.add(controlColours.setup("control colours", false));
 	gui.add(noteRandomiseColours.setup("randomise note colours", false));
@@ -213,7 +216,8 @@ void testApp::draw(){
 	//vp2.draw(lambda,controllers,reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,reversemain?1.0f/scale:scale,reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f);
 	for (int i=0;i<viewports.size();i++) {
 		bool even=!(i%2);
-		viewports[i]->draw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/(scale+os):scale+os,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f,fadeBackground);
+		bool do_reverse=reverse?!(even&&reversemain):even&&reversemain;
+		viewports[i]->draw(lambda,controllers,do_reverse?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,do_reverse?1.0f/(scale+os):scale+os,do_reverse?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f,fadeBackground);
 	}
 
 	ofSetColor(255,255,255);
@@ -531,12 +535,12 @@ void testApp::nmidiMessage(int event,int data1, int data2) {
 
                 note=data1;
                 lastnoteTime=ofGetElapsedTimef();
-                if (list.layers.size()&&list.lock()) { //if playlist is loaded
+                if (list.lock()&&list.layers.size()) { //if playlist is loaded
 			map<int, layer*>::iterator itr;
 			//for(itr = list.layers.begin(); itr != list.layers.end(); ++itr){
 			//	list.layers[itr->first]->setNote(note);
 			//}
-			list.layers[note]->setNote(note);
+			if (list.layers.find(note)!=list.layers.end()) list.layers[note]->setNote(note);
 			list.unlock();
 		}
 		if (noteRandomiseColours) {