Make the bigscreen application read in the number of players per machine, but don...

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index dcf8a78245af878042bc83b583fc08febe0baf54..8e65990f1dcdcac2a3ec999ed2e22b54d4330dea 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -52,7 +52,7 @@ void init(pqxx::connection &conn)
                        for (unsigned j = 0; j < i->num_machines; ++j) {
                                RotateScreen *rs = new RotateScreen();
                                screens.push_back(rs);
-                               rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines));
+                               rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
                        }
                }
        }
@@ -90,7 +90,7 @@ void init(pqxx::connection &conn)
                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));
+                       finished_groups_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1, 1));
                }
        }