X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=fbbc0aaed7a06baf1640f63781dd814c19660382;hp=9db87c8f9be0f9024c344ef2ea502a2b1ca2adab;hb=b99a635489016a50867699ffb587c66b3c39e939;hpb=44f3ad694f8fe5dd76602d30c9bc1f3de9650f97

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9db87c8..fbbc0aa 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,14 +8,22 @@
 #include "widestring.h"
 #include "fetch_current_tournament.h"
 #include "fetch_list_of_active_groups.h"
+#include "fetch_group.h"
 #include "fonts.h"
+#include "groupscreen.h"
 
 Tournament active_tournament;
-std::vector<Group> active_groups;
-unsigned char framebuf[800 * 600 * 4];
+std::vector<SkeletonGroup> active_groups;
+std::vector<GenericScreen *> screens;
+unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 {
+	for (std::vector<GenericScreen *>::const_iterator i = screens.begin(); i != screens.end(); ++i) {
+		delete *i;
+	}
+	screens.erase(screens.begin(), screens.end());
+	
 	conn.perform(FetchCurrentTournament(&active_tournament));
 	conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -24,9 +32,11 @@ void init(pqxx::connection &conn)
 	} else {
 		std::fprintf(stderr, "Current tournament is %d\n", active_tournament.id);
 
-		for (std::vector<Group>::const_iterator i = active_groups.begin(); i != active_groups.end(); ++i) {
+		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);
+
+			screens.push_back(new GroupScreen(conn, i->tournament, i->round, i->parallel));
 		}
 	}
 }
@@ -35,26 +45,22 @@ 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.size() > 0) {
+		if (screens[0]->check_invalidated()) {
+			screens[0]->draw(screenbuf);
+		}
 
-	// fetch all songs
-	pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") );
-	unsigned y = 0;
-	for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
-		my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255);
-		y += 20;
-//		std::fprintf(stderr, "%s\n", i["title"].c_str());
+		memcpy(framebuf, screenbuf, 800*600*4);
 	}
-	t.commit();
 
 	ptc_update(framebuf);
-	sleep(1);
+	conn.await_notification(0, 50000);
 }
 
 int main(int argc, char **argv)