X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;h=321005c049fdd67341d2904e31d8a9aa09f353b8;hp=3110684cf66ea637b43a12f8aa76b3d54ba3accd;hb=9c22e166f4d25f2d80766de9baab56efd9d952b0;hpb=723136532e3bb8b318b595b9eeef031275d5c72e;ds=sidebyside

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 3110684..321005c 100644
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #include "top5chosenscreen.h"
 #include "fonts.h"
 
@@ -20,13 +21,23 @@ bool Top5ChosenScreen::check_invalidated()
 	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();
-	memset(buf, 0, 800 * 600 * 4);
+	memset(buf, 0, SCREEN_WIDTH * SCREEN_HEIGHT * 4);
 
 	// 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);
-		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
@@ -63,7 +74,7 @@ void Top5ChosenScreen::draw(unsigned char *buf)
 		
 		std::sprintf(str, "%u", i->frequency);
 		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 728 - width/2, y, r, g, b);
+		my_draw_text(str, buf, 24.0, 745 - width/2, y, r, g, b);
 
 		y += 40;
 	}