Do some funky channel magic on fading between different versions of the same screen...

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 2114093f36c8164f44d4afabba97145d5799dd13..96c1a4f2c14faa1e6fd3b2e6580c41600649fa7c 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -12,11 +12,13 @@
 #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;
+//SplitScreen *mainscreen = NULL;
+RotateScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
@@ -31,6 +33,8 @@ void init(pqxx::connection &conn)
        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 {
@@ -41,6 +45,7 @@ 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]);
                }
        }
 
@@ -50,7 +55,7 @@ void init(pqxx::connection &conn)
        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)
@@ -63,10 +68,12 @@ void main_loop(pqxx::connection &conn)
 
        if (mainscreen->check_invalidated()) {
                mainscreen->draw(framebuf);
+               ptc_update(framebuf);
+               conn.await_notification(0, 10000);
+       } else {
+               ptc_update(framebuf);
+               conn.await_notification(0, 200000);
        }
-       ptc_update(framebuf);
-
-       conn.await_notification(0, 50000);
 }
 
 int main(int argc, char **argv)