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

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 527e9c5..8a858d3 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -9,8 +9,10 @@
 #include "fetch_current_tournament.h"
 #include "fetch_list_of_active_groups.h"
 #include "fetch_group.h"
+#include "fetch_auxilliary_screens.h"
 #include "fonts.h"
 #include "groupscreen.h"
+#include "top10scorescreen.h"
 #include "splitscreen.h"
 #include "rotatescreen.h"
 
@@ -22,6 +24,8 @@ unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 {
+	std::vector<widestring> aux_screens;
+		
 	if (screens.size() == 0 || mainscreen != screens[0])
 		delete mainscreen;
 	
@@ -39,16 +43,30 @@ void init(pqxx::connection &conn)
 		std::fprintf(stderr, "Current tournament is %d\n", active_tournament.id);
 
 		for (std::vector<SkeletonGroup>::const_iterator i = active_groups.begin(); i != active_groups.end(); ++i) {
-			std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
-				i->tournament, i->round, i->parallel);
+			std::fprintf(stderr, "tourn: %u  round: %u  parallel: %u  num_machines: %u\n",
+				i->tournament, i->round, i->parallel, i->num_machines);
 
 			// memory leaks here?
-			RotateScreen *rs = new RotateScreen();
-			screens.push_back(rs);
-			rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel));
+			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));
+			}
 		}
 	}
 
+	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;
+		}
+		std::fprintf(stderr, "Foobarbaz?\n");
+	}
+	
 	// hack
 	screens.push_back(NULL);
 	screens.push_back(NULL);