Replace 800x600 width a resolution from a .h file. Lots of positions are still hardco...

[ccbs] / bigscreen / top5chosenscreen.cpp

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 1c4e495b2be9f8346624774af12cbfc2a1b64a49..321005c049fdd67341d2904e31d8a9aa09f353b8 100644 (file)
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 
 #include <cstdio>
 #include <algorithm>
 

+#include "resolution.h"

 #include "top5chosenscreen.h"
 #include "fonts.h"
 
 #include "top5chosenscreen.h"
 #include "fonts.h"
 


@@ -20,13 +21,23 @@ bool Top5ChosenScreen::check_invalidated()
        if (!scores_changed.get_flag())
                return false;
 
        if (!scores_changed.get_flag())
                return false;
 

-       return true;
+       // check that there are indeed changes, otherwise don't bother
+       std::vector<TopChosen> scores;
+       conn.perform(FetchTopChosenSongsForTournament(tournament, 5, &scores));
+
+       for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+               if (seen_topchosen.count(*i) == 0) {
+                       return true;
+               }       
+       }
+       
+       return false;

 }
 
 void Top5ChosenScreen::draw(unsigned char *buf)
 {
        scores_changed.reset_flag();
 }
 
 void Top5ChosenScreen::draw(unsigned char *buf)
 {
        scores_changed.reset_flag();

-       memset(buf, 0, 800 * 600 * 4);
+       memset(buf, 0, SCREEN_WIDTH * SCREEN_HEIGHT * 4);

 
        // fetch the top 5 chosen songs
        std::vector<TopChosen> scores;
 
        // fetch the top 5 chosen songs
        std::vector<TopChosen> scores;


@@ -34,7 +45,7 @@ void Top5ChosenScreen::draw(unsigned char *buf)
 
        {
                unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0);
 
        {
                unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0);

-               my_draw_text("Today's top 5 chosen songs", buf, 40.0, 800/2 - width/2, 60);
+               my_draw_text("Today's top 5 chosen songs", buf, 40.0, SCREEN_WIDTH/2 - width/2, 60);

        }
 
        // simple headings
        }
 
        // simple headings