X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=025d44bf6e435da5f4d116b12b712a9e753581d0;hb=8cbc3e3bf318ca7b1d2ee6483f6db07ef5ea7a07;hp=0892c16a7f66d26d4a619f36fd78e63edf12647a;hpb=295701bd0835259dcf72b57779e77eeded720baa;p=ccbs

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 0892c16..025d44b 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,16 +19,18 @@
 #include "splitscreen.h"
 #include "rotatescreen.h"
 
+SDL_Surface *screen = NULL;
+
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
 GenericScreen *mainscreen = NULL;
-unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
+unsigned char framebuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4], screenbuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
 
 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,47 +56,23 @@ 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));
+				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
 			}
 		}
 	}
 
-	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));
-			continue;
-		}
-		if (*i == widestring("top5chosen")) {
-			aux_screen->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
-			continue;
+	{
+		conn.perform(FetchAuxilliaryScreens(&aux_screens));
+		for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
+			if (*i == widestring("top10scores")) {
+				rs->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
+				continue;
+			}
+			if (*i == widestring("top5chosen")) {
+				rs->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
+				continue;
+			}
 		}
-		std::fprintf(stderr, "Foobarbaz?\n");
-	}
-
-	// add all finished screens to the auxilliary screens
-	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) {
-		aux_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 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]);
 	}
 }
 
@@ -103,22 +85,34 @@ void main_loop(pqxx::connection &conn)
 	}
 
 	if (mainscreen && mainscreen->check_invalidated()) {
-		mainscreen->draw(framebuf);
-		ptc_update(framebuf);
+		mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
+		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", 800, 600);
+	SDL_Init(SDL_INIT_VIDEO);
+	screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_DOUBLEBUF | SDL_FULLSCREEN);
+	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");
 		
@@ -138,6 +132,8 @@ int main(int argc, char **argv)
 		std::fprintf(stderr, "Exception: %s\n", e.what());
 		exit(1);
 	}
+
+	SDL_Quit();
 	
 	return 0;
 }