Implement a simple priority system.

[ccbs] / bigscreen / rotatescreen.cpp

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 6b244e8df47501a26de5fe24dc07db4e91ce7039..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())
@@ -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();
                        }
                }
 
@@ -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;