Make sure each screen stays on for a minimum of three seconds (eight if it contains...

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 6b244e8df47501a26de5fe24dc07db4e91ce7039..275b73ed0820c8806b9b8999ca0688528b929c47 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;
                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())
        
        for (unsigned i = 0; i < subscreens.size(); ++i) {
                if (subscreens[i].screen->check_invalidated())


@@ -147,6 +149,22 @@ bool RotateScreen::needs_update()
        return (since >= 10.0);
 }
 
        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;
 void RotateScreen::add_screen(GenericScreen *screen)
 {
        Subscreen ss;

diff --git a/bigscreen/rotatescreen.h b/bigscreen/rotatescreen.h
index 114f6c02816bb265472f55dce0e316e972767ddd..6a5c35f70b7031e82270463defae10da707cbc41 100644 (file)
--- a/bigscreen/rotatescreen.h
+++ b/bigscreen/rotatescreen.h
@@ -26,6 +26,7 @@ private:
        bool in_fade, fade_found_start_time, fade_to_new_info;
 
        bool needs_update();
        bool in_fade, fade_found_start_time, fade_to_new_info;
 
        bool needs_update();

+       bool can_update();

        
 public:
        RotateScreen();
        
 public:
        RotateScreen();