X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=b32c5b1405fa71bed93d5527ee978fcf75c98bc0;hp=aa94da2913d1d2508a446485262724de3b795eb0;hb=bd55f6835567a11e5a490d4a872bc778c96d1e83;hpb=22ef1e003f53437829039885c5aedf20a22423d9

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index aa94da2..b32c5b1 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,21 +8,36 @@
 #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"
 
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
-unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
+GenericScreen *mainscreen = NULL;
+unsigned char framebuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4], screenbuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
 
 void init(pqxx::connection &conn)
 {
+	std::vector<widestring> aux_screens;
+	
+	if (screens.size() == 0 || mainscreen != screens[0])
+		delete mainscreen;
+	
 	for (std::vector<GenericScreen *>::const_iterator i = screens.begin(); i != screens.end(); ++i) {
 		delete *i;
 	}
 	screens.erase(screens.begin(), screens.end());
+
+	RotateScreen *rs = new RotateScreen();
+	mainscreen = rs;
 	
 	conn.perform(FetchCurrentTournament(&active_tournament));
 	conn.perform(FetchListOfActiveGroups(&active_groups));
@@ -33,10 +48,27 @@ 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?
+			for (unsigned j = 0; j < i->num_machines; ++j) {
+				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
+			}
+		}
+	}
 
-			screens.push_back(new GroupScreen(conn, i->tournament, i->round, i->parallel));
+	{
+		conn.perform(FetchAuxilliaryScreens(&aux_screens));
+		for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
+			if (*i == widestring("top10scores")) {
+				rs->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
+				continue;
+			}
+			if (*i == widestring("top5chosen")) {
+				rs->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
+				continue;
+			}
 		}
 	}
 }
@@ -45,31 +77,27 @@ void main_loop(pqxx::connection &conn)
 {
 	if (active_tournament.id == -1) {
 		// No active tournament, sleep a second or so and exit
-		sleep(1);
+		conn.await_notification(1, 0);
 		return;
 	}
 
-	memset(framebuf, 0, 800*600*4);
-	
-	pqxx::work t(conn, "trx");
-
-	if (screens[0]->check_invalidated()) {
-		screens[0]->draw(screenbuf);
+	if (mainscreen && mainscreen->check_invalidated()) {
+		mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
+		ptc_update(framebuf);
+		conn.await_notification(0, 10000);
+	} else {
+		ptc_update(framebuf);
+		conn.await_notification(0, 200000);
 	}
-	
-	memcpy(framebuf, screenbuf, 800*600*4);
-
-	ptc_update(framebuf);
-	sleep(1);
 }
 
 int main(int argc, char **argv)
 {
-	ptc_open("CCBS bigscreen", 800, 600);
+	ptc_open("CCBS bigscreen", SCREEN_WIDTH, SCREEN_HEIGHT);
 	
 	try {
 		init_freetype();
-		pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
+		pqxx::connection conn("dbname=ccbs host=www.positivegaming.com user=ccbs password=GeT|>>B_");
 		FlagTrigger tournament_changed(conn, "active_tournament");
 		FlagTrigger rounds_changed(conn, "active_groups");