X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=d28a56fcef2a7707642803ecc9b9e2b2178fead9;hp=829f84d0a1d9a49a9761e0fe1e514edab25a5e21;hb=f0955c93464993b82d087f48150d363c6c57054f;hpb=865e85b2e5da68f6bf0b907d239f2277579382a6

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 829f84d..d28a56f 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -17,8 +17,7 @@
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
-//SplitScreen *mainscreen = NULL;
-RotateScreen *mainscreen = NULL;
+SplitScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
@@ -33,8 +32,6 @@ void init(pqxx::connection &conn)
 	conn.perform(FetchCurrentTournament(&active_tournament));
 	conn.perform(FetchListOfActiveGroups(&active_groups));
 
-	mainscreen = new RotateScreen();
-	
 	if (active_tournament.id == -1) {
 		std::fprintf(stderr, "No active tournament\n");
 	} else {
@@ -44,8 +41,10 @@ void init(pqxx::connection &conn)
 			std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
 				i->tournament, i->round, i->parallel);
 
-			screens.push_back(new GroupScreen(conn, i->tournament, i->round, i->parallel));
-			mainscreen->add_screen(screens[screens.size() - 1]);
+			// memory leaks here?
+			RotateScreen *rs = new RotateScreen();
+			screens.push_back(rs);
+			rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel));
 		}
 	}
 
@@ -55,7 +54,7 @@ void init(pqxx::connection &conn)
 	screens.push_back(NULL);
 	screens.push_back(NULL);
 
-	//mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+	mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
 }
 
 void main_loop(pqxx::connection &conn)
@@ -68,10 +67,12 @@ void main_loop(pqxx::connection &conn)
 
 	if (mainscreen->check_invalidated()) {
 		mainscreen->draw(framebuf);
+		ptc_update(framebuf);
+		conn.await_notification(0, 10000);
+	} else {
+		ptc_update(framebuf);
+		conn.await_notification(0, 200000);
 	}
-	ptc_update(framebuf);
-
-	conn.await_notification(0, 50000);
 }
 
 int main(int argc, char **argv)