The main screen is now a split screen of rotation screens (each with a single group)

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 96c1a4f2c14faa1e6fd3b2e6580c41600649fa7c..d28a56fcef2a7707642803ecc9b9e2b2178fead9 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -17,8 +17,7 @@
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;

-//SplitScreen *mainscreen = NULL;
-RotateScreen *mainscreen = NULL;
+SplitScreen *mainscreen = NULL;

 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)


@@ -33,8 +32,6 @@ void init(pqxx::connection &conn)
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 

-       mainscreen = new RotateScreen();
-       

        if (active_tournament.id == -1) {
                std::fprintf(stderr, "No active tournament\n");
        } else {
        if (active_tournament.id == -1) {
                std::fprintf(stderr, "No active tournament\n");
        } else {


@@ -44,8 +41,10 @@ void init(pqxx::connection &conn)
                        std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
                                i->tournament, i->round, i->parallel);
 
                        std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
                                i->tournament, i->round, i->parallel);
 

-                       screens.push_back(new GroupScreen(conn, i->tournament, i->round, i->parallel));
-                       mainscreen->add_screen(screens[screens.size() - 1]);
+                       // memory leaks here?
+                       RotateScreen *rs = new RotateScreen();
+                       screens.push_back(rs);
+                       rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel));

                }
        }
 
                }
        }
 


@@ -55,7 +54,7 @@ void init(pqxx::connection &conn)
        screens.push_back(NULL);
        screens.push_back(NULL);
 
        screens.push_back(NULL);
        screens.push_back(NULL);
 

-       //mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+       mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);

 }
 
 void main_loop(pqxx::connection &conn)
 }
 
 void main_loop(pqxx::connection &conn)