Combined patch (sorry): fix URL, fix points awarded.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 583035619994ac15f41fd5f3afb64babd97776de..b32c5b1405fa71bed93d5527ee978fcf75c98bc0 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,6 +8,7 @@
 #include "widestring.h"
 #include "fetch_current_tournament.h"
 #include "fetch_list_of_active_groups.h"
+#include "fetch_list_of_finished_groups.h"
 #include "fetch_group.h"
 #include "fetch_auxilliary_screens.h"
 #include "fonts.h"
@@ -21,12 +22,12 @@ 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;
        
@@ -35,6 +36,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));
 
@@ -49,39 +53,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");
-       }
-       
-       // 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]);
        }
 }
 
@@ -94,7 +82,7 @@ void main_loop(pqxx::connection &conn)
        }
 
        if (mainscreen && mainscreen->check_invalidated()) {
-               mainscreen->draw(framebuf);
+               mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
                ptc_update(framebuf);
                conn.await_notification(0, 10000);
        } else {
@@ -105,11 +93,11 @@ void main_loop(pqxx::connection &conn)
 
 int main(int argc, char **argv)
 {
-       ptc_open("CCBS bigscreen", 800, 600);
+       ptc_open("CCBS bigscreen", SCREEN_WIDTH, SCREEN_HEIGHT);
        
        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");