Actually check in changes from last time...

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index d8450f8679d370a8e16b97170433e5e75ae6855b..7e45628851225e48da81b472d789fb6d098ecfe9 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,9 +1,11 @@
+#include <cstdio>
 #include <algorithm>
 
 #include "groupscreen.h"
 #include "fetch_group.h"
 #include "fetch_max_score_for_song.h"
 #include "fetch_max_score_for_player.h"
+#include "fetch_needs_update.h"
 #include "fonts.h"
 
 GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel)
@@ -17,8 +19,18 @@ GroupScreen::~GroupScreen()
 
 bool GroupScreen::check_invalidated()
 {
-       // we might want to do this slightly more sophisticated later, but for now this will do
-       return !valid || scores_changed.get_flag();
+       if (!valid)
+               return true;
+       if (!scores_changed.get_flag())
+               return false;
+
+       bool needs_update;
+       conn.perform(FetchNeedsUpdate(last_updated, tournament, round, parallel, &needs_update));
+
+       if (!needs_update)
+               scores_changed.reset_flag();
+       
+       return needs_update;
 }
 
 void GroupScreen::draw(unsigned char *buf)
@@ -27,6 +39,7 @@ void GroupScreen::draw(unsigned char *buf)
 
        Group group;
        conn.perform(FetchGroup(tournament, round, parallel, &group));
+       gettimeofday(&last_updated, NULL);
 
        memset(buf, 0, 800 * 600 * 4);
 
@@ -108,19 +121,17 @@ void GroupScreen::draw(unsigned char *buf)
 
                unsigned col = 1;
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
-                       char text[16];
-                       sprintf(text, "%u", j->score);
+                       char text[16] = "";
+                       if (j->score != -1) {
+                               sprintf(text, "%u", j->score);
+                       }
        
                        unsigned this_width = my_draw_text(text, NULL, 22.0);
                        if (j->chosen) {
-                               if (j->score != -1) {
-                                       my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
-                               }
+                               my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
                                my_draw_text((mode == 0) ? j->song.title : j->song.short_title, buf, 12.0, x + max_num_width + 10, y);
                        } else {
-                               if (j->score != -1) {
-                                       my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
-                               }
+                               my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
                        }
                        x += width[col] + 20;
                }