From e632e908a973a87c82e061f36167ea162d1e390f Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Thu, 8 Aug 2013 22:09:59 +0100
Subject: a few playlist changes + whole screen fade

---
 liveengine/src/testApp.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'liveengine/src/testApp.cpp')

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;
             }
         }
-- 
cgit v1.2.3