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

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 829f84d..527e9c5 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -17,24 +17,22 @@
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
-//SplitScreen *mainscreen = NULL;
-RotateScreen *mainscreen = NULL;
+GenericScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 {
+	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());
-	
-	delete mainscreen;
-	
+
 	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 +42,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 +55,11 @@ void init(pqxx::connection &conn)
 	screens.push_back(NULL);
 	screens.push_back(NULL);
 
-	//mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+	if (screens[1] == NULL) {
+		mainscreen = screens[0];
+	} else {
+		mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+	}
 }
 
 void main_loop(pqxx::connection &conn)
@@ -66,12 +70,14 @@ void main_loop(pqxx::connection &conn)
 		return;
 	}
 
-	if (mainscreen->check_invalidated()) {
+	if (mainscreen && 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)