X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;h=702b24fdab551d5e2e8665abfde40c65b8b1f0d4;hb=6bd21f38c6a860ba75ea98f2404c83d9bd55498a;hp=1c4e495b2be9f8346624774af12cbfc2a1b64a49;hpb=8240e621177bc46692cdf538ad66baa8e296a220;p=ccbs

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 1c4e495..702b24f 100644
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -1,9 +1,15 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #include "top5chosenscreen.h"
 #include "fonts.h"
 
+#define RANK_X 30
+#define SONG_X 70
+#define FREQUENCY_X (LOGICAL_SCREEN_WIDTH - 55)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 190)
+
 Top5ChosenScreen::Top5ChosenScreen(pqxx::connection &conn, unsigned tournament)
 	: conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
 {
@@ -19,14 +25,27 @@ bool Top5ChosenScreen::check_invalidated()
 		return true;
 	if (!scores_changed.get_flag())
 		return false;
+	scores_changed.reset_flag();
+
+	// check that there are indeed changes, otherwise don't bother
+	std::vector<TopChosen> scores;
+	conn.perform(FetchTopChosenSongsForTournament(tournament, 5, &scores));
 
-	return true;
+	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+		if (seen_topchosen.count(*i) == 0) {
+			valid = false;
+			return true;
+		}       
+	}
+	
+	return false;
 }
 
-void Top5ChosenScreen::draw(unsigned char *buf)
+void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, 800 * 600 * 4);
+	memset(buf, 0, width * height * 4);
+	set_screen_size(width, height);
 
 	// fetch the top 5 chosen songs
 	std::vector<TopChosen> scores;
@@ -34,12 +53,12 @@ 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, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
 	}
 
 	// simple headings
-	my_draw_text("Song", buf, 12.0, 70, 100);
-	my_draw_text("Frequency", buf, 12.0, 710, 100);
+	my_draw_text("Song", buf, 12.0, SONG_X, 100);
+	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - 35, 100);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
@@ -53,17 +72,17 @@ void Top5ChosenScreen::draw(unsigned char *buf)
 
 		std::sprintf(str, "%u", row++);
 		unsigned width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 30 - width/2, y);
+		my_draw_text(str, buf, 24.0, RANK_X - width/2, y);
 
-		if (my_draw_text(i->title, NULL, 24.0) > 610) {
-			my_draw_text(i->shorttitle, buf, 24.0, 70, y, r, g, b);
+		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);
 		} else {
-			my_draw_text(i->title, buf, 24.0, 70, y, r, g, b);
+			my_draw_text(i->title, buf, 24.0, SONG_X, y, r, g, b);
 		}
 		
 		std::sprintf(str, "%u", i->frequency);
 		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 745 - width/2, y, r, g, b);
+		my_draw_text(str, buf, 24.0, FREQUENCY_X - width/2, y, r, g, b);
 
 		y += 40;
 	}