X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=fb0d75740c1c0875cb0e3f18e38256c929a9f02e;hp=9d173b20eac06954834c27f3abf2f2caa64a8528;hb=141adc9f5acb9ed1e98a206abb0d2e9cfdce6d2f;hpb=05d5f90a554f75e6e4b3b3c900432b19d9d8d35a

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9d173b2..fb0d757 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -6,49 +6,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <tinyptc.h>
-#include <endian.h>
-
-iconv_t ucs4_iconv;
-
-// UCS-4 string with support for getting from UTF-8
-class widestring : public std::wstring
-{
-public:
-	void operator= (const char *from)
-	{
-		unsigned bytes = std::strlen(from);
-		char *from_buf = strdup(from);
-		wchar_t *to_buf = new wchar_t[bytes + 1];
-
-		char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
-
-		size_t in_left = bytes;
-		size_t out_left = bytes * sizeof(wchar_t);
-
-		size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			throw std::runtime_error("Error in iconv during initialization");
-		}
-
-		ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			perror("iconv");
-			throw std::runtime_error("Error in iconv during conversion");
-		}
-
-		erase(begin(), end());
-		std::copy(to_buf, reinterpret_cast<wchar_t *> (outptr), std::back_inserter(*this));
-
-		free(from_buf);
-		delete[] to_buf;
-	}
-};
-
-template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
-{
-	to = from;
-}
+#include "flagtrigger.h"
+#include "widestring.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);
 
@@ -61,33 +20,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 +105,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 {
@@ -237,28 +169,25 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
 int main(int argc, char **argv)
 {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	ucs4_iconv = iconv_open("ucs-4le", "utf-8");
-#else	
-	ucs4_iconv = iconv_open("ucs-4be", "utf-8");
-#endif
-	
 	ptc_open("CCBS bigscreen", 800, 600);
 	
 	try {
 		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());