For the top5/top10 screens, split the “data” class.

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index a024e9878d3cf3708d635b2550ba08a26491d996..a9a52bf0d6335c5a919a4a7fae245937eb4e50d1 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -67,31 +67,35 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
        unsigned row = 1, y = 140;
        for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
                char str[16];
-               std::string theme_element = "data";
-               std::string heading_theme_element = "rowheading";
+               std::string heading_theme_element = "top10scores.rowheading";
+               std::string nick_theme_element = "top10scores.nick";
+               std::string songname_theme_element = "top10scores.songname";
+               std::string frequency_theme_element = "top10scores.frequency";
 
                // print new entries in red
                if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
-                       theme_element = "freshdata";
-                       heading_theme_element = "freshrowheading";
+                       heading_theme_element = "top10scores.freshrowheading";
+                       nick_theme_element = "top10scores.freshnick";
+                       songname_theme_element = "top10scores.freshsongname";
+                       frequency_theme_element = "top10scores.freshfrequency";
                }
 
                std::sprintf(str, "%u", row++);
                unsigned width = my_draw_text(str, NULL, 24.0, heading_theme_element);
                my_draw_text(str, buf, 24.0, heading_theme_element, RANK_X - width/2, y);
 
-               my_draw_text(i->nick, buf, 24.0, theme_element, PLAYER_X, y);
+               my_draw_text(i->nick, buf, 24.0, nick_theme_element, PLAYER_X, y);
 
-               if (my_draw_text(i->title, NULL, 24.0, theme_element) > SONG_MAX_WIDTH &&
+               if (my_draw_text(i->title, NULL, 24.0, songname_theme_element) > SONG_MAX_WIDTH &&
                    !i->shorttitle.empty()) {
-                       my_draw_text(i->shorttitle, buf, 24.0, theme_element, SONG_X, y);
+                       my_draw_text(i->shorttitle, buf, 24.0, songname_theme_element, SONG_X, y);
                } else {
-                       my_draw_text(i->title, buf, 24.0, theme_element, SONG_X, y);
+                       my_draw_text(i->title, buf, 24.0, songname_theme_element, SONG_X, y);
                }
                
                std::sprintf(str, "%u", i->score);
-               width = my_draw_text(str, NULL, 24.0, theme_element);
-               my_draw_text(str, buf, 24.0, theme_element, SCORE_X - width/2, y);
+               width = my_draw_text(str, NULL, 24.0, frequency_theme_element);
+               my_draw_text(str, buf, 24.0, frequency_theme_element, SCORE_X - width/2, y);
 
                y += 40;
        }