Move Tournament and FetchCurrentTournament into its own file.

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index ac92796539d215250e3a73456841aa0a74ed24b5..00a8e92cb949470a5c50998daaf2ef6660cdfbe4 100644 (file)
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -4,7 +4,7 @@ CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib
 LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11
-CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o
+CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o
 
 all: ccbs-bigscreen
 

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index fb0d75740c1c0875cb0e3f18e38256c929a9f02e..745faa5a8715e11b1a7154a9f4ff547a9d9e4b01 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,40 +8,13 @@
 #include <tinyptc.h>
 #include "flagtrigger.h"
 #include "widestring.h"
+#include "fetch_current_tournament.h"
 
 int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector<FT_Face> &fontlist);
 
-class Tournament {
-public:
-       int id;
-       widestring name;
-};
-
 Tournament active_tournament;
 std::vector<FT_Face> fonts;
 
-/* A transactor that fetches the current tournament and some information about it. */
-class FetchCurrentTournament : public pqxx::transactor<> {
-private:
-       Tournament *tourn;
-
-public:
-       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);
-
-                       tourn->id = tournament["tournament"].as(tourn->id);
-                       tourn->name = tournament["tournamentname"].as(tourn->name);
-               } catch (PGSTD::out_of_range &e) {
-                       tourn->id = -1;
-                       tourn->name = "";
-               }
-       }
-};
-
 void init(pqxx::connection &conn)
 {
        conn.perform(FetchCurrentTournament(&active_tournament));

diff --git a/bigscreen/fetch_current_tournament.cpp b/bigscreen/fetch_current_tournament.cpp
new file mode 100644 (file)
index 0000000..364d8b3
--- /dev/null
+++ b/bigscreen/fetch_current_tournament.cpp
@@ -0,0 +1,16 @@
+#include "fetch_current_tournament.h"
+
+FetchCurrentTournament::FetchCurrentTournament(Tournament *tourn) : tourn(tourn) {}
+void FetchCurrentTournament::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);
+
+               tourn->id = tournament["tournament"].as(tourn->id);
+               tourn->name = tournament["tournamentname"].as(tourn->name);
+       } catch (PGSTD::out_of_range &e) {
+               tourn->id = -1;
+               tourn->name = "";
+       }
+}

diff --git a/bigscreen/fetch_current_tournament.h b/bigscreen/fetch_current_tournament.h
new file mode 100644 (file)
index 0000000..4700871
--- /dev/null
+++ b/bigscreen/fetch_current_tournament.h
@@ -0,0 +1,23 @@
+#ifndef _FETCH_CURRENT_TOURNAMENT_H
+#define _FETCH_CURRENT_TOURNAMENT_H 1
+
+#include <pqxx/transactor>
+#include "widestring.h"
+
+class Tournament {
+public:
+       int id;
+       widestring name;
+};
+
+/* A transactor that fetches the current tournament and some information about it. */
+class FetchCurrentTournament : public pqxx::transactor<> {
+private:
+       Tournament *tourn;
+
+public:
+       FetchCurrentTournament(Tournament *tourn);
+       void operator() (pqxx::transaction<> &t);
+};
+
+#endif /* !defined(_FETCH_CURRENT_TOURNAMENT_H) */