a few playlist changes + whole screen fade

3 files changed, 11 insertions, 9 deletions

diff --git a/liveengine/src/main.cpp b/liveengine/src/main.cpp
index f0c0c0f..d22025f 100755
--- a/liveengine/src/main.cpp
+++ b/liveengine/src/main.cpp
@@ -7,7 +7,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	ofSetupOpenGL(ofxFensterManager::get(),1024,768, OF_WINDOW); //2048,768
+	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/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp
index c69ac66..ced71d4 100755
--- a/liveengine/src/testApp.cpp
+++ b/liveengine/src/testApp.cpp
@@ -427,12 +427,14 @@ void testApp::keyPressed(int key, ofxFenster* win){
 }
 void testApp::keyPressed(int key){
 
-    	if (activeView<0) for (int i=0;i<viewports.size();i++) if (viewports[i]->isMapped) viewports[i]->keyPressed(key);
-        else if (activeView<viewports.size()&&viewports[activeView]->isMapped) viewports[activeView]->keyPressed(key);
+    	if (activeView==-1) {
+		for (int i=0;i<viewports.size();i++) if (viewports[i]->isMapped) viewports[i]->keyPressed(key);
+	}
+        else if (activeView>-1&&activeView<viewports.size()&&viewports[activeView]->isMapped) viewports[activeView]->keyPressed(key);
 
 
         if (key>='0' && key <='5'){
-            activeView=min(key-'2',(int)viewports.size());
+            activeView=min(key-'2',(int)viewports.size()-1);
             switch (activeView){
                 case -2:
                     printf("deactivating viewport adjustment\n");
@@ -444,7 +446,7 @@ void testApp::keyPressed(int key){
                 case 1:
                 case 2:
                 case 3:
-                    printf("adjusting viewport %i\n",activeView );
+                    printf("adjusting viewport %i of %i\n",activeView,viewports.size());
                     break;
             }
         }
diff --git a/liveengine/src/viewport.cpp b/liveengine/src/viewport.cpp
index ddd1450..f86110f 100755
--- a/liveengine/src/viewport.cpp
+++ b/liveengine/src/viewport.cpp
@@ -184,10 +184,10 @@ void viewport::setcam(map<string,string>&settings){
 	vars[1].set('g','d',ofToFloat(settings["targX"]),10,1.0,3.0);
 	vars[2].set('r','v',ofToFloat(settings["targY"]),10,1.0,3.0);
 	vars[3].set('t','c',ofToFloat(settings["targZ"]),10,1.0,3.0);
-	vars[4].set('u','n',ofToFloat(settings["lat"]),1,1.0,3.0);
-	vars[5].set('j','h',ofToFloat(settings["lng"]),1,1.0,3.0);
-	vars[6].set(',','m',ofToFloat(settings["roll"]),1,1.0,3.0);
-	vars[7].set('o','l',ofToFloat(settings["dolly"]),1,1.0,3.0);
+	vars[4].set('u','n',ofToFloat(settings["lat"]),.03,1.0,3.0);
+	vars[5].set('j','h',ofToFloat(settings["lng"]),.03,1.0,3.0);
+	vars[6].set(',','m',ofToFloat(settings["roll"]),0.03,1.0,3.0);
+	vars[7].set('o','l',ofToFloat(settings["dolly"]),25,1.0,3.0);
 	vars[8].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0);
 }
 double viewport::getSetting(const string& setting){