Actually add flagtrigger.{h,cpp}...

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9d173b20eac06954834c27f3abf2f2caa64a8528..9740a8e718ed9b9ce9ac1210a07edef545b0fff0 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -7,6 +7,7 @@
 #include FT_FREETYPE_H
 #include <tinyptc.h>
 #include <endian.h>
+#include "flagtrigger.h"
 
 iconv_t ucs4_iconv;
 
@@ -61,33 +62,6 @@ public:
 Tournament active_tournament;
 std::vector<FT_Face> fonts;
 
-/* A trigger that sets a flag whenever it's trigged. */
-class FlagTrigger : pqxx::trigger {
-private:
-       bool flag;
-       
-public:
-       FlagTrigger(pqxx::connection_base &conn, const PGSTD::string &name)
-               : pqxx::trigger(conn, name), flag(false) {}
-       virtual ~FlagTrigger() throw () {}
-       
-       virtual void operator() (int pid)
-       {
-               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;
-       }
-};
-
 /* A transactor that fetches the current tournament and some information about it. */
 class FetchCurrentTournament : public pqxx::transactor<> {
 private:
@@ -173,7 +147,7 @@ void init_freetype()
                fonts.push_back(face);
        }
        
-       // FreeSerif
+       // Arial Unicode MS
        if (FT_New_Face(library, "arialuni.ttf", 0, &face)) {
                std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n");
        } else {
@@ -249,16 +223,19 @@ int main(int argc, char **argv)
                init_freetype();
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");
+               FlagTrigger rounds_changed(conn, "active_groups");
                
-               // when active_tournament is changed, we destroy everything and start from scratch
+               // when active_tournament or active_rounds is changed, we destroy everything and start from scratch
+               // (at least currently)
                for ( ;; ) {
                        tournament_changed.reset_flag();
+                       rounds_changed.reset_flag();
                        init(conn);
                        do {
                                main_loop(conn);
                                conn.get_notifs();
-                       } while (!tournament_changed.get_flag());
-                       std::fprintf(stderr, "active_tournament changed, resetting...\n");
+                       } while (!tournament_changed.get_flag() && !rounds_changed.get_flag());
+                       std::fprintf(stderr, "active_tournament or active_groups changed, resetting...\n");
                }
        } catch (const std::exception &e) {
                std::fprintf(stderr, "Exception: %s\n", e.what());