X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Frotatescreen.cpp;h=78a0e783693ceb3b1ff8fcbeb7964f7c49b6c6af;hp=a7d3a5c01b34a89b9f6aef7d615d5591526afeaa;hb=9c22e166f4d25f2d80766de9baab56efd9d952b0;hpb=d994a4d55c8390dc892490345160cb79ff91caeb

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index a7d3a5c..78a0e78 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -4,7 +4,7 @@
 RotateScreen::RotateScreen()
 	: valid(false), current_screen(0), in_fade(false)
 {
-	fadefrom_buf = new unsigned char[800 * 600 * 4];
+	fadefrom_buf = new unsigned char[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
 }
 
 RotateScreen::~RotateScreen()
@@ -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())
@@ -52,17 +54,17 @@ 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 > 5.5 || (!same_fade && elapsed_fade > 0.5)) {
+		if (elapsed_fade > 5.5 || (!fade_to_new_info && 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);
+			memcpy(buf, subscreens[current_screen].buf, SCREEN_WIDTH * SCREEN_HEIGHT * 4);
 		} else {
 			// find the fade factors
 			int fr, fg, fb, fa;
-			if (same_fade) {
+			if (fade_to_new_info) {
 				if (elapsed_fade < 0.5) {
 					fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
 				} else {
@@ -76,9 +78,9 @@ void RotateScreen::draw(unsigned char *buf)
 			unsigned char *sptr2 = subscreens[current_screen].buf;
 			unsigned char *dptr = buf;
 
-			if (same_fade && elapsed_fade >= 0.5) {
+			if (fade_to_new_info && elapsed_fade >= 0.5) {
 				// fade G&B to be = R
-				for (unsigned i = 0; i < 800 * 600; ++i) {
+				for (unsigned i = 0; i < SCREEN_WIDTH * SCREEN_HEIGHT; ++i) {
 					dptr[0] = sptr2[0] + (((int(sptr2[2]) - int(sptr2[0])) * fb) >> 8);
 					dptr[1] = sptr2[1] + (((int(sptr2[2]) - int(sptr2[1])) * fg) >> 8);
 					dptr[2] = sptr2[2];
@@ -87,7 +89,7 @@ void RotateScreen::draw(unsigned char *buf)
 					sptr1 += 4, sptr2 += 4, dptr += 4;
 				}
 			} else {
-				for (unsigned i = 0; i < 800 * 600; ++i) {
+				for (unsigned i = 0; i < SCREEN_WIDTH * SCREEN_HEIGHT; ++i) {
 					dptr[0] = sptr1[0] + (((int(sptr2[0]) - int(sptr1[0])) * fb) >> 8);
 					dptr[1] = sptr1[1] + (((int(sptr2[1]) - int(sptr1[1])) * fg) >> 8);
 					dptr[2] = sptr1[2] + (((int(sptr2[2]) - int(sptr1[2])) * fr) >> 8);
@@ -101,12 +103,14 @@ void RotateScreen::draw(unsigned char *buf)
 		// determine if we want to switch screens
 	
 		unsigned old_current_screen = current_screen;
+		int priority = -9999;  // bah :-P
 		
 		// push any invalidated screen first (for now)
 		for (unsigned i = 0; i < subscreens.size(); ++i) {
-			if (subscreens[i].screen->check_invalidated()) {
+			if (subscreens[i].screen->check_invalidated() && subscreens[i].screen->get_priority() > priority) {
 				current_screen = i;
 				force = true;
+				priority = subscreens[i].screen->get_priority();
 			}
 		}
 
@@ -120,9 +124,9 @@ void RotateScreen::draw(unsigned char *buf)
 			// initialize a fade
 			in_fade = true;
 			fade_found_start_time = false;
-			same_fade = (current_screen == old_current_screen) || force;
+			fade_to_new_info = force;
 			
-			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, 800 * 600 * 4);
+			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, SCREEN_WIDTH * SCREEN_HEIGHT * 4);
 
 			if (subscreens[current_screen].screen->check_invalidated())
 				subscreens[current_screen].screen->draw(subscreens[current_screen].buf);
@@ -147,10 +151,26 @@ 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.buf = new unsigned char[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
 	ss.screen = screen;
 
 	screen->draw(ss.buf);