Make RotateScreen fade between the individual screens.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index dfb025f92cf72b0773a6c000b5ebee35686cbb41..829f84d0a1d9a49a9761e0fe1e514edab25a5e21 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -11,10 +11,14 @@
 #include "fetch_group.h"
 #include "fonts.h"
 #include "groupscreen.h"
+#include "splitscreen.h"
+#include "rotatescreen.h"
 
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
+//SplitScreen *mainscreen = NULL;
+RotateScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
@@ -24,9 +28,13 @@ void init(pqxx::connection &conn)
        }
        screens.erase(screens.begin(), screens.end());
        
+       delete mainscreen;
+       
        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 {
@@ -37,8 +45,17 @@ void init(pqxx::connection &conn)
                                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]);
                }
        }
+
+       // hack
+       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]);
 }
 
 void main_loop(pqxx::connection &conn)
@@ -49,15 +66,11 @@ void main_loop(pqxx::connection &conn)
                return;
        }
 
-       memset(framebuf, 0, 800*600*4);
-       
-       if (screens[0]->check_invalidated()) {
-               screens[0]->draw(screenbuf);
+       if (mainscreen->check_invalidated()) {
+               mainscreen->draw(framebuf);
        }
-       
-       memcpy(framebuf, screenbuf, 800*600*4);
-
        ptc_update(framebuf);
+
        conn.await_notification(0, 50000);
 }