Rename tourn -> active_tournament

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index c9cb82d56f147efa3e2c6dc5fb868a7211c69f2c..08d2bf24576fad8da550d4c5f07e7ebdad037638 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -3,6 +3,14 @@
 #include <pqxx/pqxx>
 #include "glwindow.h"
 
+class Tournament {
+public:
+       int id;
+       std::string name;
+};
+
+Tournament active_tournament;
+
 /* A trigger that sets a flag whenever it's trigged. */
 class FlagTrigger : pqxx::trigger {
 private:
@@ -33,59 +41,51 @@ public:
 /* A transactor that fetches the current tournament and some information about it. */
 class FetchCurrentTournament : public pqxx::transactor<> {
 private:
-       int id;
-       std::string name;
+       Tournament *tourn;
 
 public:
-       FetchCurrentTournament() {}
+       FetchCurrentTournament(Tournament *tourn) : tourn(tourn) {}
        void operator() (pqxx::transaction<> &t)
        {
                pqxx::result res( t.exec("SELECT * FROM bigscreen.active_tournament NATURAL JOIN tournaments") );
                try {
                        pqxx::result::tuple tournament = res.at(0);
 
-                       id = tournament["tournament"].as(id);
-                       name = tournament["tournament"].as(name);
+                       tourn->id = tournament["tournament"].as(tourn->id);
+                       tourn->name = tournament["tournamentname"].as(tourn->name);
                } catch (PGSTD::out_of_range &e) {
-                       std::fprintf(stderr, "foof\n");
-                       
-                       id = -1;
-                       name = "";
+                       tourn->id = -1;
+                       tourn->name = "";
                }
        }
-
-       int get_tournament_id() const
-       {
-               return id;
-       }
-       
-       std::string get_tournament_name() const
-       {
-               return name;
-       }
 };
 
 void init(pqxx::connection &conn)
 {
-       FetchCurrentTournament fct;
-       conn.perform(fct);
+       conn.perform(FetchCurrentTournament(&active_tournament));
 
-       if (fct.get_tournament_id() == -1) {
+       if (active_tournament.id == -1) {
                std::fprintf(stderr, "No active tournament\n");
        } else {
                std::fprintf(stderr, "Current tournament is %d (name: '%s')\n",
-                       fct.get_tournament_id(), fct.get_tournament_name().c_str());
+                       active_tournament.id, active_tournament.name.c_str());
        }
 }
 
 void main_loop(pqxx::connection &conn)
 {
+       if (active_tournament.id == -1) {
+               // No active tournament, sleep a second or so and exit
+               sleep(1);
+               return;
+       }
+       
        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());
+               std::fprintf(stderr, "%s\n", i["title"].c_str());
        }
        t.commit();