X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=3b9d6ae506ca8e11ebc4df62a7b8334dbb02948e;hp=bd8b37b05ea87e1cd21ea5c8aaeeb3dfd24812a0;hb=a3af80a53451d55958372e9dd88be22159e4186d;hpb=5c5c824a38b02e166b5b012f17cf77dcb38d59d6

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index bd8b37b..3b9d6ae 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -3,42 +3,63 @@
 #include <pqxx/pqxx>
 #include "glwindow.h"
 
-/*
- * A trigger that exits whenever it's trigged (used when we change big things
- * such as starting a new tournament, and it's not really worth doing a clean
- * change).
- */
-class ExitTrigger : pqxx::trigger {
+/* A trigger that sets a flag whenever it's trigged. */
+class FlagTrigger : pqxx::trigger {
+private:
+	bool flag;
+	
 public:
-	ExitTrigger(pqxx::connection_base &conn, const PGSTD::string &name)
-		: pqxx::trigger(conn, name) {}
+	FlagTrigger(pqxx::connection_base &conn, const PGSTD::string &name)
+		: pqxx::trigger(conn, name), flag(false) {}
+	virtual ~FlagTrigger() throw () {}
 	
 	virtual void operator() (int pid)
 	{
-		std::fprintf(stderr, "Received an exit trigger from pid %u\n", pid);
-		exit(0);
+		flag = true;
+		std::fprintf(stderr, "Received a flag trigger from pid %u\n", pid);
+	}
+
+	bool get_flag() const
+	{
+		return flag;
+	}
+
+	void reset_flag()
+	{
+		flag = false;
 	}
 };
 
+void main_loop(pqxx::connection &conn)
+{
+	pqxx::work t(conn, "trx");
+
+	// fetch all songs
+	pqxx::result res( t.exec("SELECT * FROM songs") );
+	for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
+		// std::fprintf(stderr, "%s\n", i["title"].c_str());
+	}
+	t.commit();
+	
+	sleep(1);
+}
+
 int main(int argc, char **argv)
 {
 	GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);
 	try {
-		pqxx::connection conn("dbname=ccbs host=sql.samfundet.no user=ccbs password=GeT|>>B_");
-		ExitTrigger et(conn, "bs_tournament_changed");
+		pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
+		FlagTrigger tournament_changed(conn, "active_tournament");
 		
-		sleep(1);
-
-		pqxx::work t(conn, "trx");
-
-		// fetch all songs
-		pqxx::result res( t.exec("SELECT * FROM songs") );
-		for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
-			std::fprintf(stderr, "%s\n", i["title"].c_str());
+		// when active_tournament is changed, we destroy everything and start from scratch
+		for ( ;; ) {
+			tournament_changed.reset_flag();
+			do {
+				main_loop(conn);
+				conn.get_notifs();
+			} while (!tournament_changed.get_flag());
+			std::fprintf(stderr, "active_tournament changed, resetting...\n");
 		}
-		t.commit();
-
-		sleep(1);
 	} catch (const std::exception &e) {
 		std::fprintf(stderr, "Exception: %s\n", e.what());
 		exit(1);