X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;h=3f50f82d121095e42c0bdc941f09b62564207133;hp=5d2e9dc947bbe421897a65e4f2e5d5fda3f1e660;hb=d4ec885cadcbcce077579bdd24c93ead18b06852;hpb=07c1b0a88317b59f0deee5ad5d3e4febd423acbc

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 5d2e9dc..3f50f82 100644
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -44,7 +44,13 @@ bool Top5ChosenScreen::check_invalidated()
 void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, width * height * 4);
+	unsigned char *ptr = buf;
+	for (unsigned i = 0; i < width * height; ++i) {
+		*ptr++ = BACKGROUND_BLUE;
+		*ptr++ = BACKGROUND_GREEN;
+		*ptr++ = BACKGROUND_RED;
+		*ptr++ = 0;
+	}
 	set_screen_size(width, height);
 
 	// fetch the top 5 chosen songs
@@ -53,27 +59,29 @@ void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 
 	{
 		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, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+		my_draw_text("Today's top 5 chosen songs", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60, MAIN_HEADING_RED, MAIN_HEADING_GREEN, MAIN_HEADING_BLUE);
 	}
 
 	// simple headings
-	my_draw_text("Song", buf, 12.0, SONG_X, 100);
+	my_draw_text("Song", buf, 12.0, SONG_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
 	width = my_draw_text("Frequency", NULL, 12.0);
-	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - width/2, 100);
+	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - width/2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		char str[16];
-		unsigned r = 255, g = 255, b = 255;
+		unsigned r = DATA_RED, g = DATA_GREEN, b = DATA_BLUE, rh = ROW_HEADING_RED, gh = ROW_HEADING_GREEN, bh = ROW_HEADING_BLUE;
 
 		// print new entries in red
 		if (seen_topchosen.count(*i) == 0 && seen_topchosen.size() > 0) {
-			g = b = 0;
+			r = rh = FRESH_DATA_RED;
+			g = gh = FRESH_DATA_GREEN;
+			b = bh = FRESH_DATA_BLUE;
 		}
 
 		std::sprintf(str, "%u", row++);
 		unsigned width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, RANK_X - width/2, y);
+		my_draw_text(str, buf, 24.0, RANK_X - width/2, y, rh, gh, bh);
 
 		if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH) {
 			my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b);