From: Steinar H. Gunderson <sesse@samfundet.no>
Date: Fri, 4 Mar 2005 22:47:22 +0000 (+0000)
Subject: Make the bigscreen application read in the number of players per machine, but don... 
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=6b842eb46838b703e982c14a8e573e7a5f67a71e;hp=de70f8aa6723fe016286a190ff46c0019b35f7e8

Make the bigscreen application read in the number of players per machine, but don't do anything useful with it yet.
---

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index dcf8a78..8e65990 100644
--- 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));
 		}
 	}
 	
diff --git a/bigscreen/fetch_list_of_active_groups.h b/bigscreen/fetch_list_of_active_groups.h
index fbac624..68f0500 100644
--- a/bigscreen/fetch_list_of_active_groups.h
+++ b/bigscreen/fetch_list_of_active_groups.h
@@ -5,7 +5,7 @@
 #include <vector>
 
 struct SkeletonGroup {
-	unsigned tournament, round, parallel, num_machines;
+	unsigned tournament, round, parallel, num_machines, players_per_machine;
 };
 
 /* A transactor that fetches the current list of active groups. */
diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 713c3b9..b7cb299 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -11,8 +11,8 @@
 #include "fetch_highscore.h"
 #include "fonts.h"
 
-GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines)
-	: tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), scores_changed(conn, "scores"), conn(conn), valid(false)
+GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines, unsigned players_per_machine)
+	: tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), players_per_machine(players_per_machine), scores_changed(conn, "scores"), conn(conn), valid(false)
 {
 }
 
diff --git a/bigscreen/groupscreen.h b/bigscreen/groupscreen.h
index fb27787..d017588 100644
--- a/bigscreen/groupscreen.h
+++ b/bigscreen/groupscreen.h
@@ -14,7 +14,7 @@
 /* A screen class showing a group in the tournament */
 class GroupScreen : public GenericScreen {
 private:
-	unsigned tournament, round, parallel, machine, num_machines;
+	unsigned tournament, round, parallel, machine, num_machines, players_per_machine;
 	FlagTrigger scores_changed;
 	pqxx::connection &conn;
 	bool valid;
@@ -22,7 +22,8 @@ private:
 	std::vector<TextDefer> last_text;
 
 public:
-	GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines);
+	// the last two parameters should probably not be there, but fetched from GroupScreen itself
+	GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines, unsigned players_per_machine);
 	virtual ~GroupScreen();
 
 	bool check_invalidated();