X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Frotatescreen.cpp;h=96a3ebc7bad1137f957e1971642f611ddd34247e;hp=900bac3fc40c7c22e381edf0cffaab866258b6de;hb=98c75538a60914997d5815f0483ddf7284d285f6;hpb=bb7cc9171d0c948b69e94227266f126e132ecf02

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 900bac3..96a3ebc 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -38,37 +38,39 @@ void RotateScreen::draw(unsigned char *buf)
 		struct timeval now;
 		gettimeofday(&now, NULL);
 
+		if (!fade_found_start_time) {
+			fade_found_start_time = true;
+			fade_started = now;
+		}
+		
 		double elapsed_fade = double(now.tv_sec - fade_started.tv_sec) +
 			double(now.tv_usec - fade_started.tv_usec) * 1.0e-6;
-		printf("fade: %f\n", elapsed_fade);
 		
-		if (elapsed_fade > 6.0 || (!same_fade && elapsed_fade > 1.0)) {
+		if (elapsed_fade > 5.5 || (!same_fade && elapsed_fade > 0.5)) {
 			in_fade = false;
 
 			// ugly hack here? :-)
 			subscreens[current_screen].screen->draw(subscreens[current_screen].buf);
 			
 			memcpy(buf, subscreens[current_screen].buf, 800 * 600 * 4);
-			printf("fade done\n");
 		} else {
 			// find the fade factors
 			int fr, fg, fb, fa;
 			if (same_fade) {
-				if (elapsed_fade < 1.0) {
-					fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
+				if (elapsed_fade < 0.5) {
+					fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
 				} else {
-					fr = fg = fb = fa = unsigned((elapsed_fade-1.0)/5.0 * 256.0);
+					fr = fg = fb = fa = unsigned((elapsed_fade-0.5)/5.0 * 256.0);
 				}
 			} else {
-				fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
+				fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
 			}
-			printf("%u %u %u %u\n", fr, fg, fb, fa);
 
 			unsigned char *sptr1 = fadefrom_buf;
 			unsigned char *sptr2 = subscreens[current_screen].buf;
 			unsigned char *dptr = buf;
 
-			if (same_fade && elapsed_fade >= 1.0) {
+			if (same_fade && elapsed_fade >= 0.5) {
 				// fade G&B to be = R
 				for (unsigned i = 0; i < 800 * 600; ++i) {
 					dptr[0] = sptr2[0] + (((int(sptr2[2]) - int(sptr2[0])) * fb) >> 8);
@@ -111,9 +113,8 @@ void RotateScreen::draw(unsigned char *buf)
 		if (current_screen != old_current_screen || subscreens[current_screen].screen->check_invalidated()) {
 			// initialize a fade
 			in_fade = true;
+			fade_found_start_time = false;
 			same_fade = (current_screen == old_current_screen);
-			gettimeofday(&fade_started, NULL);
-			printf("starting fade (same=%u)\n", same_fade);
 			
 			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, 800 * 600 * 4);