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 cbb4455..321005c 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"
 


@@ -36,7 +37,7 @@ bool Top5ChosenScreen::check_invalidated()
 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;


@@ -44,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