X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=d09b1c4d36f1fae35d363aa0fe7bd01ae1ef34aa;hb=0fad64f1f8ecc79312e6d27aac1bc0b3feff84c1;hp=8e65990f1dcdcac2a3ec999ed2e22b54d4330dea;hpb=6b842eb46838b703e982c14a8e573e7a5f67a71e;p=ccbs

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 8e65990..d09b1c4 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -3,7 +3,8 @@
 #include <iconv.h>
 #include <unistd.h>
 #include <pqxx/pqxx>
-#include <tinyptc.h>
+#include <SDL.h>
+
 #include "flagtrigger.h"
 #include "widestring.h"
 #include "fetch_current_tournament.h"
@@ -18,6 +19,8 @@
 #include "splitscreen.h"
 #include "rotatescreen.h"
 
+SDL_Surface *screen = NULL;
+
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
@@ -27,7 +30,7 @@ unsigned char framebuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4], screenbuf[SCREEN_WIDTH
 void init(pqxx::connection &conn)
 {
 	std::vector<widestring> aux_screens;
-		
+	
 	if (screens.size() == 0 || mainscreen != screens[0])
 		delete mainscreen;
 	
@@ -36,6 +39,9 @@ void init(pqxx::connection &conn)
 	}
 	screens.erase(screens.begin(), screens.end());
 
+	RotateScreen *rs = new RotateScreen();
+	mainscreen = rs;
+	
 	conn.perform(FetchCurrentTournament(&active_tournament));
 	conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -50,61 +56,24 @@ void init(pqxx::connection &conn)
 
 			// memory leaks here?
 			for (unsigned j = 0; j < i->num_machines; ++j) {
-				RotateScreen *rs = new RotateScreen();
-				screens.push_back(rs);
 				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
 			}
 		}
 	}
 
-	// show auxilliary screens if we have zero, two or three other screens going
-	if (screens.size() < 4 && screens.size() != 1) {
-		RotateScreen *aux_screen = new RotateScreen();
-		screens.push_back(aux_screen);
-		
+	{
 		conn.perform(FetchAuxilliaryScreens(&aux_screens));
 		for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
 			if (*i == widestring("top10scores")) {
-				aux_screen->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
+				rs->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
 				continue;
 			}
 			if (*i == widestring("top5chosen")) {
-				aux_screen->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
+				rs->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
 				continue;
 			}
-			std::fprintf(stderr, "Foobarbaz?\n");
-		}
-
-		/*
-		 * If we still have room, make yet another rotational screen with
-		 * results from previous groups -- otherwise tack them onto the end
-		 * of the auxilliary screens.
-		 */
-		RotateScreen *finished_groups_screen = aux_screen;
-		if (screens.size() < 4 && screens.size() != 1) {
-			finished_groups_screen = new RotateScreen();
-			screens.push_back(finished_groups_screen);
-		}
-			
-		std::vector<SkeletonGroup> finished_groups;
-		conn.perform(FetchListOfFinishedGroups(active_tournament.id, &finished_groups));
-			
-		for (std::vector<SkeletonGroup>::const_iterator i = finished_groups.begin(); i != finished_groups.end(); ++i) {
-			finished_groups_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1, 1));
 		}
 	}
-	
-	// hack
-	screens.push_back(NULL);
-	screens.push_back(NULL);
-	screens.push_back(NULL);
-	screens.push_back(NULL);
-
-	if (screens[1] == NULL) {
-		mainscreen = screens[0];
-	} else {
-		mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
-	}
 }
 
 void main_loop(pqxx::connection &conn)
@@ -117,21 +86,38 @@ void main_loop(pqxx::connection &conn)
 
 	if (mainscreen && mainscreen->check_invalidated()) {
 		mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
-		ptc_update(framebuf);
+		SDL_LockSurface(screen);
+		for (unsigned y = 0; y < SCREEN_HEIGHT; ++y) {
+			unsigned char *sptr = framebuf + y * SCREEN_WIDTH * 4;
+			unsigned char *dptr = (unsigned char *)screen->pixels + y * screen->pitch;
+			memcpy(dptr, sptr, SCREEN_WIDTH * 4);
+		}
+		SDL_UnlockSurface(screen);
+		SDL_Flip(screen);
 		conn.await_notification(0, 10000);
 	} else {
-		ptc_update(framebuf);
+		SDL_Flip(screen);
 		conn.await_notification(0, 200000);
 	}
 }
 
 int main(int argc, char **argv)
 {
-	ptc_open("CCBS bigscreen", SCREEN_WIDTH, SCREEN_HEIGHT);
+	SDL_Init(SDL_INIT_VIDEO);
+#if USE_FULLSCREEN
+	screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_DOUBLEBUF | SDL_FULLSCREEN);
+	SDL_ShowCursor(SDL_DISABLE);
+#else
+	screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_DOUBLEBUF);
+#endif
+	if (screen == NULL) {
+		fprintf(stderr, "Video initialization failed: %s\n", SDL_GetError());
+		exit(1);
+	}
 	
 	try {
 		init_freetype();
-		pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
+		pqxx::connection conn("dbname=ccbs host=www.positivegaming.com user=ccbs password=GeT|>>B_");
 		FlagTrigger tournament_changed(conn, "active_tournament");
 		FlagTrigger rounds_changed(conn, "active_groups");
 		
@@ -151,6 +137,8 @@ int main(int argc, char **argv)
 		std::fprintf(stderr, "Exception: %s\n", e.what());
 		exit(1);
 	}
+
+	SDL_Quit();
 	
 	return 0;
 }