Correct the logic for finding out what songs a player can choose (only random songs...

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index f50991212b4257bc323c01b3413b81f98ea2992f..d28a56fcef2a7707642803ecc9b9e2b2178fead9 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -10,13 +10,25 @@
 #include "fetch_list_of_active_groups.h"
 #include "fetch_group.h"
 #include "fonts.h"
+#include "groupscreen.h"
+#include "splitscreen.h"
+#include "rotatescreen.h"
 
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
-unsigned char framebuf[800 * 600 * 4];
+std::vector<GenericScreen *> screens;
+SplitScreen *mainscreen = NULL;
+unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 {
+       for (std::vector<GenericScreen *>::const_iterator i = screens.begin(); i != screens.end(); ++i) {
+               delete *i;
+       }
+       screens.erase(screens.begin(), screens.end());
+       
+       delete mainscreen;
+       
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -29,37 +41,38 @@ void init(pqxx::connection &conn)
                        std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
                                i->tournament, i->round, i->parallel);
 
-                       Group gr;
-                       conn.perform(FetchGroup(i->tournament, i->round, i->parallel, &gr));
-                       std::fprintf(stderr, "%u players in group\n", gr.players.size());
+                       // memory leaks here?
+                       RotateScreen *rs = new RotateScreen();
+                       screens.push_back(rs);
+                       rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel));
                }
        }
+
+       // 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)
 {
        if (active_tournament.id == -1) {
                // No active tournament, sleep a second or so and exit
-               sleep(1);
+               conn.await_notification(1, 0);
                return;
        }
 
-       memset(framebuf, 0, 800*600*4);
-       
-       pqxx::work t(conn, "trx");
-
-       // fetch all songs
-       pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") );
-       unsigned y = 0;
-       for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
-               my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255);
-               y += 20;
-//             std::fprintf(stderr, "%s\n", i["title"].c_str());
+       if (mainscreen->check_invalidated()) {
+               mainscreen->draw(framebuf);
+               ptc_update(framebuf);
+               conn.await_notification(0, 10000);
+       } else {
+               ptc_update(framebuf);
+               conn.await_notification(0, 200000);
        }
-       t.commit();
-
-       ptc_update(framebuf);
-       sleep(1);
 }
 
 int main(int argc, char **argv)