X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Frotatescreen.cpp;h=275b73ed0820c8806b9b8999ca0688528b929c47;hp=54f04238e2f36c540e2cf67423ded7f765ec600f;hb=ef1894b4aa12db7fef35e1f62be0964fb7f6159e;hpb=181cf14f1581ddf26cb956ffa24642dcccba5f40

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 54f0423..275b73e 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -20,6 +20,8 @@ bool RotateScreen::check_invalidated()
 		return true;
 	if (needs_update())
 		return true;
+	if (!can_update())
+		return false;
 	
 	for (unsigned i = 0; i < subscreens.size(); ++i) {
 		if (subscreens[i].screen->check_invalidated())
@@ -32,16 +34,27 @@ 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) {
 		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;
 		
-		if (elapsed_fade > 6.0 || (!same_fade && elapsed_fade > 1.0)) {
+		if (elapsed_fade > 5.5 || (!fade_to_new_info && elapsed_fade > 0.5)) {
 			in_fade = false;
 
 			// ugly hack here? :-)
@@ -51,21 +64,21 @@ void RotateScreen::draw(unsigned char *buf)
 		} 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 (fade_to_new_info) {
+				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 (fade_to_new_info && 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);
@@ -105,11 +118,11 @@ 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;
-			same_fade = (current_screen == old_current_screen);
-			gettimeofday(&fade_started, NULL);
+			fade_found_start_time = false;
+			fade_to_new_info = force;
 			
 			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, 800 * 600 * 4);
 
@@ -136,12 +149,30 @@ bool RotateScreen::needs_update()
 	return (since >= 10.0);
 }
 
+// hold all screens for minimum three seconds, hold all screens with new info for at minimum eight seconds
+bool RotateScreen::can_update()
+{
+	struct timeval now;
+	gettimeofday(&now, NULL);
+
+	double since = double(now.tv_sec - last_update.tv_sec) +
+		double(now.tv_usec - last_update.tv_usec) * 1.0e-6;
+
+	if (since < 3.0)
+		return false;
+	if (fade_to_new_info && since < 8.0)
+		return false;
+	return true;
+}
+
 void RotateScreen::add_screen(GenericScreen *screen)
 {
 	Subscreen ss;
 	ss.buf = new unsigned char[800 * 600 * 4];
 	ss.screen = screen;
 
+	screen->draw(ss.buf);
+	
 	subscreens.push_back(ss);
 }