X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Frotatescreen.cpp;h=ef7fba079005daa5b4eed55c6b73eeccb1aaace9;hp=3c2a4b9df16afcc0d41e822380bc65d39d4d5aa3;hb=5205061c547014321afc2d00e739c480df49d197;hpb=99b06a7cbf2cbd55cc5d6475b6b33d2fb1b2ecd0

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 3c2a4b9..ef7fba0 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -32,6 +32,12 @@ bool RotateScreen::check_invalidated()
 void RotateScreen::draw(unsigned char *buf)
 {
 	bool force = false;
+
+	if (subscreens.size() == 0) {
+		valid = true;
+		gettimeofday(&last_update, NULL);
+		return;
+	}
 	
 	// if we're in a fade, complete it before doing anything else
 	if (in_fade) {
@@ -46,7 +52,7 @@ void RotateScreen::draw(unsigned char *buf)
 		double elapsed_fade = double(now.tv_sec - fade_started.tv_sec) +
 			double(now.tv_usec - fade_started.tv_usec) * 1.0e-6;
 		
-		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? :-)
@@ -57,20 +63,20 @@ void RotateScreen::draw(unsigned char *buf)
 			// 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);
 			}
 
 			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);
@@ -110,7 +116,7 @@ void RotateScreen::draw(unsigned char *buf)
 			gettimeofday(&last_update, NULL);
 		}
 
-		if (current_screen != old_current_screen || subscreens[current_screen].screen->check_invalidated()) {
+		if (!valid || current_screen != old_current_screen || subscreens[current_screen].screen->check_invalidated()) {
 			// initialize a fade
 			in_fade = true;
 			fade_found_start_time = false;
@@ -147,6 +153,8 @@ void RotateScreen::add_screen(GenericScreen *screen)
 	ss.buf = new unsigned char[800 * 600 * 4];
 	ss.screen = screen;
 
+	screen->draw(ss.buf);
+	
 	subscreens.push_back(ss);
 }