X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=96c1a4f2c14faa1e6fd3b2e6580c41600649fa7c;hp=dfb025f92cf72b0773a6c000b5ebee35686cbb41;hb=186cdc7e5e3d5de43015985401c79e9fb5105144;hpb=6e40dbdfce9194249658112b2837565b47b34b4d

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index dfb025f..96c1a4f 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -11,10 +11,14 @@
 #include "fetch_group.h"
 #include "fonts.h"
 #include "groupscreen.h"
+#include "splitscreen.h"
+#include "rotatescreen.h"
 
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
+//SplitScreen *mainscreen = NULL;
+RotateScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
@@ -24,9 +28,13 @@ void init(pqxx::connection &conn)
 	}
 	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 {
@@ -37,8 +45,17 @@ void init(pqxx::connection &conn)
 				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]);
 		}
 	}
+
+	// hack
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+
+	//mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
 }
 
 void main_loop(pqxx::connection &conn)
@@ -49,16 +66,14 @@ void main_loop(pqxx::connection &conn)
 		return;
 	}
 
-	memset(framebuf, 0, 800*600*4);
-	
-	if (screens[0]->check_invalidated()) {
-		screens[0]->draw(screenbuf);
+	if (mainscreen->check_invalidated()) {
+		mainscreen->draw(framebuf);
+		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);
-	conn.await_notification(0, 50000);
 }
 
 int main(int argc, char **argv)