Make the bigscreen application support running groups on multiple machines.

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 527e9c5ab671c6ae33677ed95145456709f82946..fb53775f64e9d35ef194fc2e8554610eeac4df10 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -39,13 +39,15 @@ void init(pqxx::connection &conn)
                std::fprintf(stderr, "Current tournament is %d\n", active_tournament.id);
 
                for (std::vector<SkeletonGroup>::const_iterator i = active_groups.begin(); i != active_groups.end(); ++i) {
                std::fprintf(stderr, "Current tournament is %d\n", active_tournament.id);
 
                for (std::vector<SkeletonGroup>::const_iterator i = active_groups.begin(); i != active_groups.end(); ++i) {

-                       std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
-                               i->tournament, i->round, i->parallel);
+                       std::fprintf(stderr, "tourn: %u  round: %u  parallel: %u  num_machines: %u\n",
+                               i->tournament, i->round, i->parallel, i->num_machines);

 
                        // memory leaks here?
 
                        // memory leaks here?

-                       RotateScreen *rs = new RotateScreen();
-                       screens.push_back(rs);
-                       rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel));
+                       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));
+                       }

                }
        }
 
                }
        }
 

diff --git a/bigscreen/fetch_list_of_active_groups.cpp b/bigscreen/fetch_list_of_active_groups.cpp
index c2d587b1a395dd758d4f50207edc5389390594f6..ce748aa026586060cf393ff416f462d7912e7f2e 100644 (file)
--- a/bigscreen/fetch_list_of_active_groups.cpp
+++ b/bigscreen/fetch_list_of_active_groups.cpp
@@ -13,6 +13,7 @@ void FetchListOfActiveGroups::operator() (pqxx::transaction<> &t)
                g.tournament = i["tournament"].as(g.tournament);
                g.round = i["round"].as(g.round);
                g.parallel = i["parallel"].as(g.parallel);
                g.tournament = i["tournament"].as(g.tournament);
                g.round = i["round"].as(g.round);
                g.parallel = i["parallel"].as(g.parallel);

+               g.num_machines = i["num_machines"].as(g.num_machines);

 
                active->push_back(g);
        }
 
                active->push_back(g);
        }

diff --git a/bigscreen/fetch_list_of_active_groups.h b/bigscreen/fetch_list_of_active_groups.h
index b1039d384f2aa12a2061f92618894a8efff03b69..fbac624bf97656e2cc550fc1588926509998f0c8 100644 (file)
--- a/bigscreen/fetch_list_of_active_groups.h
+++ b/bigscreen/fetch_list_of_active_groups.h
@@ -5,7 +5,7 @@
 #include <vector>
 
 struct SkeletonGroup {
 #include <vector>
 
 struct SkeletonGroup {

-       unsigned tournament, round, parallel;
+       unsigned tournament, round, parallel, num_machines;

 };
 
 /* A transactor that fetches the current list of active groups. */
 };
 
 /* A transactor that fetches the current list of active groups. */

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index d0370de55c9514cc26e50a49625bc082e8f8674f..e811369c9233daae73d9f2f1ce82ce8df32d560c 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -10,8 +10,8 @@
 #include "fetch_highscore.h"
 #include "fonts.h"
 
 #include "fetch_highscore.h"
 #include "fonts.h"
 

-GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel)
-       : tournament(tournament), round(round), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
+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)

 {
 }
 
 {
 }
 


@@ -144,11 +144,15 @@ void GroupScreen::draw(unsigned char *buf)
        my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
        
        // show all the players and the scores
        my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
        
        // show all the players and the scores

-       unsigned show_players = std::min(group.players.size(), 9U);
+       unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines;
+       unsigned show_players = std::min(num_players_this_machine, 9U);

        unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
        
        unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
        

-       unsigned row = 0;
-       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i, ++row) {
+       unsigned row = 0, m = 0;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) {
+               if (m++ % num_machines != machine)
+                       continue;
+

                my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
                unsigned x = 40 + width[0];
                my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
                unsigned x = 40 + width[0];


@@ -190,6 +194,8 @@ void GroupScreen::draw(unsigned char *buf)
                        y += 40 - (show_players - 7) * 4;
                else 
                        y += 40;
                        y += 40 - (show_players - 7) * 4;
                else 
                        y += 40;

+               ++row;
+               

        }
        
        /*
        }
        
        /*


@@ -238,7 +244,7 @@ void GroupScreen::draw(unsigned char *buf)
 
        // now finally find min and max rank, and draw it all
        y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
 
        // now finally find min and max rank, and draw it all
        y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);

-       for (unsigned i = 0; i < show_players; ++i) {
+       for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) {

                unsigned best_rank = 1, worst_rank = 1;
                for (unsigned j = 0; j < group.players.size(); ++j) {
                        if (i == j)
                unsigned best_rank = 1, worst_rank = 1;
                for (unsigned j = 0; j < group.players.size(); ++j) {
                        if (i == j)


@@ -256,6 +262,9 @@ void GroupScreen::draw(unsigned char *buf)
                else
                        std::sprintf(text, "%u-%u", best_rank, worst_rank);
                
                else
                        std::sprintf(text, "%u-%u", best_rank, worst_rank);
                

+               if (i % num_machines != machine)
+                       continue;
+               

                unsigned this_width = my_draw_text(text, NULL, 22.0);
                my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 
                unsigned this_width = my_draw_text(text, NULL, 22.0);
                my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 


@@ -284,9 +293,10 @@ void GroupScreen::draw(unsigned char *buf)
         * Needs to win group: <winscore>
         */
        
         * Needs to win group: <winscore>
         */
        

-       /* Find the first player with the fewest songs played. */
+       /* Find the first player with the fewest songs played and part of this machine. */

        unsigned min_played_songs = 9999, num_random_songs = 0;
        Player *next_player = NULL;
        unsigned min_played_songs = 9999, num_random_songs = 0;
        Player *next_player = NULL;

+       m = 0;

        for (std::vector<Player>::iterator i = group.players.begin(); i != group.players.end(); ++i) {
                unsigned this_played = 0, this_random_songs = 0;
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
        for (std::vector<Player>::iterator i = group.players.begin(); i != group.players.end(); ++i) {
                unsigned this_played = 0, this_random_songs = 0;
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {


@@ -296,7 +306,7 @@ void GroupScreen::draw(unsigned char *buf)
                                ++this_random_songs;
                }
 
                                ++this_random_songs;
                }
 

-               if (this_played < min_played_songs) {
+               if ((m++ % num_machines == machine) && this_played < min_played_songs) {

                        min_played_songs = this_played;
                        next_player = &(*i);
                        num_random_songs = this_random_songs;  // should be equal for all
                        min_played_songs = this_played;
                        next_player = &(*i);
                        num_random_songs = this_random_songs;  // should be equal for all

diff --git a/bigscreen/groupscreen.h b/bigscreen/groupscreen.h
index 3d24403443e6aa0b957a02ee9aa73abd3f3fdd5f..21ab17248e2bb4ab54056e9778d12a63f3d422a2 100644 (file)
--- 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:
 /* A screen class showing a group in the tournament */
 class GroupScreen : public GenericScreen {
 private:

-       unsigned tournament, round, parallel;
+       unsigned tournament, round, parallel, machine, num_machines;

        FlagTrigger scores_changed;
        pqxx::connection &conn;
        bool valid;
        FlagTrigger scores_changed;
        pqxx::connection &conn;
        bool valid;


@@ -22,7 +22,7 @@ private:
        std::vector<TextDefer> last_text;
 
 public:
        std::vector<TextDefer> last_text;
 
 public:

-       GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel);
+       GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines);

        virtual ~GroupScreen();
 
        bool check_invalidated();
        virtual ~GroupScreen();
 
        bool check_invalidated();