Clean up the my_draw_text() interface considerably, and let us set sizes per-call.

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 596905b116cfcffb5c9c5a9b7c65407ec250259b..008379bd9e7bec6953361f3aa33eff9136e2fe92 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -33,18 +33,18 @@ void GroupScreen::draw(unsigned char *buf)
        for (unsigned i = 0; i < 16; ++i)
                width[i] = 0;
 
-       unsigned max_num_width = my_draw_text("88888", NULL, 0, 0, false, 0, 0, 0);
+       unsigned max_num_width = my_draw_text("88888", NULL, 12.0);
 
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 0, 0, false, 0, 0, 0));
+               width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 12.0));
 
                unsigned col = 1;
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        if (j->chosen) {
-                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0) + 
+                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0) + 
                                                                  max_num_width + 10);
                        } else {                
-                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0));
+                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0));
                                width[col] = std::max(width[col], max_num_width);
                        }
                }
@@ -54,14 +54,14 @@ void GroupScreen::draw(unsigned char *buf)
        unsigned col = 1, x = 40 + width[0];
        for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
                if (!i->chosen)
-                       my_draw_text(i->song.title, buf, x, 30, true, 255, 255, 255);
+                       my_draw_text(i->song.title, buf, 12.0, x, 30);
                x += width[col] + 20;
        }
        
        // show all the players and the scores
        unsigned y = 50;
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               my_draw_text(i->nick, buf, 20, y, true, 255, 255, 255);
+               my_draw_text(i->nick, buf, 12.0, 20, y);
 
                unsigned x = 40 + width[0];
 
@@ -70,15 +70,15 @@ void GroupScreen::draw(unsigned char *buf)
                        char text[16];
                        sprintf(text, "%u", j->score);
        
-                       unsigned this_width = my_draw_text(text, buf, 0, 0, false, 0, 0, 0);
+                       unsigned this_width = my_draw_text(text, NULL, 12.0);
                        if (j->chosen) {
                                if (j->score != -1) {
-                                       my_draw_text(text, buf, x + max_num_width - this_width, y, true, 255, 255, 255);
+                                       my_draw_text(text, buf, 12.0, x + max_num_width - this_width, y);
                                }
-                               my_draw_text(j->song.title, buf, x + max_num_width + 10, y, true, 255, 255, 255);
+                               my_draw_text(j->song.title, buf, 12.0, x + max_num_width + 10, y);
                        } else {
                                if (j->score != -1) {
-                                       my_draw_text(text, buf, x + width[col] / 2 - this_width / 2, y, true, 255, 255, 255);
+                                       my_draw_text(text, buf, 12.0, x + width[col] / 2 - this_width / 2, y);
                                }
                        }
                        x += width[col] + 20;