X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=8e65990f1dcdcac2a3ec999ed2e22b54d4330dea;hp=8a858d35d05b80c62392a427efea630021ea2d71;hb=6b842eb46838b703e982c14a8e573e7a5f67a71e;hpb=c0503ae47521a645f60d14bbef87ee3d205fed21

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 8a858d3..8e65990 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,11 +8,13 @@
 #include "widestring.h"
 #include "fetch_current_tournament.h"
 #include "fetch_list_of_active_groups.h"
+#include "fetch_list_of_finished_groups.h"
 #include "fetch_group.h"
 #include "fetch_auxilliary_screens.h"
 #include "fonts.h"
 #include "groupscreen.h"
 #include "top10scorescreen.h"
+#include "top5chosenscreen.h"
 #include "splitscreen.h"
 #include "rotatescreen.h"
 
@@ -20,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)
 {
@@ -50,21 +52,46 @@ void init(pqxx::connection &conn)
 			for (unsigned j = 0; j < i->num_machines; ++j) {
 				RotateScreen *rs = new RotateScreen();
 				screens.push_back(rs);
-				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines));
+				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
 			}
 		}
 	}
 
-	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;
+	// 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");
+		}
+
+		/*
+		 * 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, 1));
 		}
-		std::fprintf(stderr, "Foobarbaz?\n");
 	}
 	
 	// hack
@@ -89,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 {
@@ -100,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();