X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=dcf8a78245af878042bc83b583fc08febe0baf54;hp=0892c16a7f66d26d4a619f36fd78e63edf12647a;hb=09ae4d8636130d4c86ab3f8df8f823482f948f97;hpb=295701bd0835259dcf72b57779e77eeded720baa

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 0892c16..dcf8a78 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -22,7 +22,7 @@ Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
 GenericScreen *mainscreen = NULL;
-unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
+unsigned char framebuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4], screenbuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
 
 void init(pqxx::connection &conn)
 {
@@ -57,28 +57,41 @@ void init(pqxx::connection &conn)
 		}
 	}
 
-	RotateScreen *aux_screen = new RotateScreen();
-	screens.push_back(aux_screen);
-	
-	conn.perform(FetchAuxilliaryScreens(&aux_screens));
-	for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
-		if (*i == widestring("top10scores")) {
-			aux_screen->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
-			continue;
-		}
-		if (*i == widestring("top5chosen")) {
-			aux_screen->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
-			continue;
+	// show auxilliary screens if we have zero, two or three other screens going
+	if (screens.size() < 4 && screens.size() != 1) {
+		RotateScreen *aux_screen = new RotateScreen();
+		screens.push_back(aux_screen);
+		
+		conn.perform(FetchAuxilliaryScreens(&aux_screens));
+		for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
+			if (*i == widestring("top10scores")) {
+				aux_screen->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
+				continue;
+			}
+			if (*i == widestring("top5chosen")) {
+				aux_screen->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
+				continue;
+			}
+			std::fprintf(stderr, "Foobarbaz?\n");
 		}
-		std::fprintf(stderr, "Foobarbaz?\n");
-	}
 
-	// add all finished screens to the auxilliary screens
-	std::vector<SkeletonGroup> finished_groups;
-	conn.perform(FetchListOfFinishedGroups(active_tournament.id, &finished_groups));
-		
-	for (std::vector<SkeletonGroup>::const_iterator i = finished_groups.begin(); i != finished_groups.end(); ++i) {
-		aux_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1));
+		/*
+		 * If we still have room, make yet another rotational screen with
+		 * results from previous groups -- otherwise tack them onto the end
+		 * of the auxilliary screens.
+		 */
+		RotateScreen *finished_groups_screen = aux_screen;
+		if (screens.size() < 4 && screens.size() != 1) {
+			finished_groups_screen = new RotateScreen();
+			screens.push_back(finished_groups_screen);
+		}
+			
+		std::vector<SkeletonGroup> finished_groups;
+		conn.perform(FetchListOfFinishedGroups(active_tournament.id, &finished_groups));
+			
+		for (std::vector<SkeletonGroup>::const_iterator i = finished_groups.begin(); i != finished_groups.end(); ++i) {
+			finished_groups_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1));
+		}
 	}
 	
 	// hack
@@ -103,7 +116,7 @@ void main_loop(pqxx::connection &conn)
 	}
 
 	if (mainscreen && mainscreen->check_invalidated()) {
-		mainscreen->draw(framebuf);
+		mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
 		ptc_update(framebuf);
 		conn.await_notification(0, 10000);
 	} else {
@@ -114,7 +127,7 @@ void main_loop(pqxx::connection &conn)
 
 int main(int argc, char **argv)
 {
-	ptc_open("CCBS bigscreen", 800, 600);
+	ptc_open("CCBS bigscreen", SCREEN_WIDTH, SCREEN_HEIGHT);
 	
 	try {
 		init_freetype();