In RotateScreen destructor, do not leak subscreen surfaces.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index b32c5b1405fa71bed93d5527ee978fcf75c98bc0..7165bc393006f1843c406bb28943ec04bdfa8652 100644 (file)
--- 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;
@@ -36,9 +39,11 @@ void init(pqxx::connection &conn)
        }
        screens.erase(screens.begin(), screens.end());
 
+#if !USE_SPLITSCREEN
        RotateScreen *rs = new RotateScreen();
        mainscreen = rs;
-       
+#endif
+
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -53,12 +58,30 @@ void init(pqxx::connection &conn)
 
                        // memory leaks here?
                        for (unsigned j = 0; j < i->num_machines; ++j) {
+#if USE_SPLITSCREEN
+                               RotateScreen *rs = new RotateScreen();
+                               screens.push_back(rs);
+#endif
                                rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
                        }
                }
        }
 
-       {
+       bool show_only_main_screen = (USE_SPLITSCREEN && screens.size() == 1);
+
+       /*
+        * Show auxilliary screens except if we have too many already,
+        * or if we're in the special split-screen end-tournament mode,
+        * where there if only one.
+        */
+       RotateScreen *aux_screen = NULL;
+       if (screens.size() < 4 && !show_only_main_screen) {
+#if USE_SPLITSCREEN
+               RotateScreen *rs = new RotateScreen();
+               screens.push_back(rs);
+#endif
+               aux_screen = rs;
+
                conn.perform(FetchAuxilliaryScreens(&aux_screens));
                for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
                        if (*i == widestring("top10scores")) {
@@ -71,6 +94,45 @@ void init(pqxx::connection &conn)
                        }
                }
        }
+
+#if USE_SPLITSCREEN
+       /*
+        * 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;
+       if (show_only_main_screen) {
+               finished_groups_screen = NULL;
+       } else if (screens.size() < 4) {
+               finished_groups_screen = new RotateScreen();
+               screens.push_back(finished_groups_screen);
+       } else {
+               finished_groups_screen = aux_screen;
+       }
+       if (finished_groups_screen != NULL) {
+               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));
+               }
+       }
+#endif
+
+#if USE_SPLITSCREEN
+       // 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]);
+       }
+#endif
 }
 
 void main_loop(pqxx::connection &conn)
@@ -82,18 +144,41 @@ void main_loop(pqxx::connection &conn)
        }
 
        if (mainscreen && mainscreen->check_invalidated()) {
-               mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
-               ptc_update(framebuf);
+               if (screen->pitch == SCREEN_WIDTH * 4) {
+                       SDL_LockSurface(screen);
+                       mainscreen->draw((unsigned char *)screen->pixels, SCREEN_WIDTH, SCREEN_HEIGHT);
+                       SDL_UnlockSurface(screen);
+               } else {
+                       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", 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();
@@ -117,6 +202,8 @@ int main(int argc, char **argv)
                std::fprintf(stderr, "Exception: %s\n", e.what());
                exit(1);
        }
+
+       SDL_Quit();
        
        return 0;
 }