X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=c233f4726742169f2706470bb199e011d8448a17;hp=c9cb82d56f147efa3e2c6dc5fb868a7211c69f2c;hb=eb548f080c1bfba8b4e5c23a8d5d1a8da229a78c;hpb=67a137c169546903ce19fc23ba5955426691f4f7

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index c9cb82d..c233f47 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -1,113 +1,76 @@
 #include <cstdio>
+#include <cstring>
+#include <iconv.h>
 #include <unistd.h>
 #include <pqxx/pqxx>
-#include "glwindow.h"
+#include <tinyptc.h>
+#include "flagtrigger.h"
+#include "widestring.h"
+#include "fetch_current_tournament.h"
+#include "fonts.h"
 
-/* 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:
-	int id;
-	std::string name;
-
-public:
-	FetchCurrentTournament() {}
-	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);
-		} catch (PGSTD::out_of_range &e) {
-			std::fprintf(stderr, "foof\n");
-			
-			id = -1;
-			name = "";
-		}
-	}
-
-	int get_tournament_id() const
-	{
-		return id;
-	}
-	
-	std::string get_tournament_name() const
-	{
-		return name;
-	}
-};
+Tournament active_tournament;
+unsigned char framebuf[800 * 600 * 4];
 
 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;
+	}
+
+	memset(framebuf, 0, 800*600*4);
+	
 	pqxx::work t(conn, "trx");
 
 	// fetch all songs
-	pqxx::result res( t.exec("SELECT * FROM songs") );
+	pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") );
+	unsigned y = 0;
 	for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
-		// std::fprintf(stderr, "%s\n", i["title"].c_str());
+		my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255);
+		y += 20;
+//		std::fprintf(stderr, "%s\n", i["title"].c_str());
 	}
 	t.commit();
-	
+
+	ptc_update(framebuf);
 	sleep(1);
 }
 
 int main(int argc, char **argv)
 {
-	GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);
+	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());