Implement a simple priority system.

[ccbs] / bigscreen / rotatescreen.cpp

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index a7d3a5c01b34a89b9f6aef7d615d5591526afeaa..fcc975cbc1ba54a86fa15972a6a5064fe655253c 100644 (file)
--- 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())
@@ -52,7 +54,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 > 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? :-)
@@ -62,7 +64,7 @@ void RotateScreen::draw(unsigned char *buf)
                } 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,7 +78,7 @@ 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) {
                                        dptr[0] = sptr2[0] + (((int(sptr2[2]) - int(sptr2[0])) * fb) >> 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,7 +124,7 @@ 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);
 
@@ -147,6 +151,22 @@ 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;