X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.cpp;h=d6d32008e73ba6f89f8ae8ea2dda007b18a278af;hb=c7d5ff85088aeab9d979bf7c7a261df963b722eb;hp=e515cf3d3aac90fc3d6fdc7577dada8ab1d53d42;hpb=ce4dab76ec9284afb67ea73c70a70b2c027b21bc;p=ultimatescore diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index e515cf3..d6d3200 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -2,7 +2,12 @@ #include "post_to_main_thread.h" #include "ui_mainwindow.h" +#include +#include +#include #include +#include +#include using namespace std; @@ -52,7 +57,7 @@ string escape_quotes(const string &str) { string s = ""; for (char ch : str) { - if (ch == '"' || ch == '\\') { + if (ch == '"') { s += '\\'; } s += ch; @@ -84,20 +89,20 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); - acmp = new ACMPClient("127.0.0.1", 5250); - acmp->add_init_command("MIXER 1 STRAIGHT_ALPHA_OUTPUT 1"); - acmp->add_init_command("CG 1 ADD 0 \"score\" 1 \"\""); - acmp->set_connection_callback([this](bool connected) { + ws = new WSServer("127.0.0.1", 5250); + ws->set_connection_callback([this](bool connected) { string msg = connected ? "Connected" : "Not connected"; post_to_main_thread([this, msg]() { - ui->casparcg_connected_label->setText(QString::fromStdString(msg)); + ui->ws_connected_label->setText(QString::fromStdString(msg)); }); }); - acmp->start(); + udp_thread = std::thread(&MainWindow::udp_thread_func, this, 6000); + udp_thread2 = std::thread(&MainWindow::udp_thread_func, this, 6001); - connect(ui->casparcg_reconnect_btn, &QPushButton::clicked, this, &MainWindow::casparcg_reconnect_clicked); + connect(ui->ws_disconnect_btn, &QPushButton::clicked, this, &MainWindow::ws_disconnect_clicked); connect(ui->set_initials_btn, &QPushButton::clicked, this, &MainWindow::set_initials_clicked); + connect(ui->set_match_2_initials_btn, &QPushButton::clicked, this, &MainWindow::set_match_2_initials_clicked); connect(ui->set_color_btn, &QPushButton::clicked, this, &MainWindow::set_color_clicked); connect(ui->set_score_btn, &QPushButton::clicked, this, &MainWindow::set_score_clicked); connect(ui->set_all_scorebug_btn, &QPushButton::clicked, this, &MainWindow::set_all_scorebug_clicked); @@ -107,15 +112,19 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->ungoal_2_btn, &QPushButton::clicked, this, [this]() { add_goal(ui->score_2_box, -1); }); connect(ui->set_clock_btn, &QPushButton::clicked, this, &MainWindow::set_clock_clicked); + connect(ui->set_clock_limit_btn, &QPushButton::clicked, this, &MainWindow::set_clock_limit_clicked); connect(ui->start_and_show_clock_btn, &QPushButton::clicked, this, &MainWindow::start_and_show_clock_clicked); connect(ui->stop_clock_btn, &QPushButton::clicked, this, &MainWindow::stop_clock_clicked); connect(ui->show_clock_btn, &QPushButton::clicked, this, &MainWindow::show_clock_clicked); connect(ui->hide_clock_btn, &QPushButton::clicked, this, &MainWindow::hide_clock_clicked); + connect(ui->show_match_2_btn, &QPushButton::clicked, this, &MainWindow::show_match_2_clicked); + connect(ui->hide_match_2_btn, &QPushButton::clicked, this, &MainWindow::hide_match_2_clicked); connect(ui->set_comment_btn, &QPushButton::clicked, this, &MainWindow::set_comment_clicked); connect(ui->set_and_show_comment_btn, &QPushButton::clicked, this, &MainWindow::set_and_show_comment_clicked); connect(ui->hide_comment_btn, &QPushButton::clicked, this, &MainWindow::hide_comment_clicked); connect(ui->set_and_show_autocomment_btn, &QPushButton::clicked, this, &MainWindow::set_and_show_autocomment_clicked); + connect(ui->autoshow_autocomment, &QCheckBox::stateChanged, this, &MainWindow::autocomment_update); connect(ui->show_lower_third_btn, &QPushButton::clicked, this, &MainWindow::show_lower_third_clicked); connect(ui->hide_lower_third_btn, &QPushButton::clicked, this, &MainWindow::hide_lower_third_clicked); @@ -129,6 +138,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->show_schedule_btn, &QPushButton::clicked, this, &MainWindow::show_schedule_clicked); connect(ui->show_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_carousel_clicked); connect(ui->show_nothing_btn, &QPushButton::clicked, this, &MainWindow::show_nothing_clicked); + connect(ui->show_roster_1_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_1_edit->text().toStdString()); }); + connect(ui->show_roster_2_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_2_edit->text().toStdString()); }); + connect(ui->show_roster_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_roster_carousel_clicked); autocomment_update(); @@ -139,14 +151,12 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { - acmp->end(); delete ui; } -void MainWindow::casparcg_reconnect_clicked() +void MainWindow::ws_disconnect_clicked() { - acmp->change_server(ui->casparcg_host_box->text().toStdString(), - stoi(ui->casparcg_port_box->text().toStdString())); + ws->change_port(stoi(ui->ws_port_box->text().toStdString())); } void MainWindow::set_initials_clicked() @@ -154,8 +164,17 @@ void MainWindow::set_initials_clicked() map param; param["team1"] = escape_html(ui->initials_1_edit->text().toStdString()); param["team2"] = escape_html(ui->initials_2_edit->text().toStdString()); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setteams"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setteams()"); +} + +void MainWindow::set_match_2_initials_clicked() +{ + map param; + param["team1"] = escape_html(ui->match_2_initials_1_edit->text().toStdString()); + param["team2"] = escape_html(ui->match_2_initials_2_edit->text().toStdString()); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setteams2()"); } void MainWindow::set_color_clicked() @@ -163,8 +182,8 @@ void MainWindow::set_color_clicked() map param; param["team1color"] = ui->color_1_edit->text().toStdString(); // Should maybe be escaped, but meh. param["team2color"] = ui->color_2_edit->text().toStdString(); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setcolors"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setcolors()"); } void MainWindow::set_score_clicked() @@ -172,8 +191,8 @@ void MainWindow::set_score_clicked() map param; param["score1"] = to_string(ui->score_1_box->value()); param["score2"] = to_string(ui->score_2_box->value()); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setscore"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setscore()"); autocomment_update(); } @@ -195,42 +214,61 @@ void MainWindow::set_clock_clicked() map param; param["clock_min"] = to_string(ui->clock_min_box->value()); param["clock_sec"] = to_string(ui->clock_sec_box->value()); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setclockfromstate"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setclockfromstate()"); +} + +void MainWindow::set_clock_limit_clicked() +{ + map param; + param["clock_limit_min"] = to_string(ui->clock_limit_min_box->value()); + param["clock_limit_sec"] = to_string(ui->clock_limit_sec_box->value()); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setclocklimitfromstate()"); } void MainWindow::start_and_show_clock_clicked() { - acmp->send_command("cg 1 invoke 1 startclock"); // Also shows. + ws->send_command("eval startclock()"); // Also shows. } void MainWindow::stop_clock_clicked() { - acmp->send_command("cg 1 invoke 1 stopclock"); + ws->send_command("eval stopclock()"); } void MainWindow::show_clock_clicked() { - acmp->send_command("cg 1 invoke 1 showclock"); + ws->send_command("eval showclock()"); } void MainWindow::hide_clock_clicked() { - acmp->send_command("cg 1 invoke 1 hideclock"); + ws->send_command("eval hideclock()"); +} + +void MainWindow::show_match_2_clicked() +{ + ws->send_command("eval showmatch2()"); +} + +void MainWindow::hide_match_2_clicked() +{ + ws->send_command("eval hidematch2()"); } void MainWindow::set_comment_clicked() { map param; param["comment"] = ui->comment_edit->text().toStdString(); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setcomment"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setcomment()"); } void MainWindow::set_and_show_comment_clicked() { set_comment_clicked(); - acmp->send_command("cg 1 invoke 1 showcomment"); + ws->send_command("eval showcomment()"); } void MainWindow::set_and_show_autocomment_clicked() @@ -241,7 +279,7 @@ void MainWindow::set_and_show_autocomment_clicked() void MainWindow::hide_comment_clicked() { - acmp->send_command("cg 1 invoke 1 hidecomment"); + ws->send_command("eval hidecomment()"); } void MainWindow::show_lower_third_clicked() @@ -249,13 +287,13 @@ void MainWindow::show_lower_third_clicked() map param; param["text1"] = ui->lowerthird_heading_edit->text().toStdString(); param["text2"] = ui->lowerthird_subheading_edit->text().toStdString(); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 setandshowlowerthird"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setandshowlowerthird()"); } void MainWindow::hide_lower_third_clicked() { - acmp->send_command("cg 1 invoke 1 hidelowerthird"); + ws->send_command("eval hidelowerthird()"); } void MainWindow::quick_lower_third_activate() @@ -265,11 +303,13 @@ void MainWindow::quick_lower_third_activate() add_goal(ui->score_1_box, 1); } else if (code == "B") { add_goal(ui->score_2_box, 1); + } else if (code == "C") { + ws->send_command("eval hidelowerthird()"); } else { map param; param["code"] = code; - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 quicklowerthird"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval quicklowerthird()"); } ui->quick_lower_third_edit->clear(); } @@ -281,47 +321,197 @@ void MainWindow::autocomment_update() string msg; if (abs(score1 - score2) >= 3) { msg = "Game ends after this point"; - } else if (score1 >= 12 || score2 >= 12) { - msg = "Point cap: First to 13"; } else { - char buf[32]; - snprintf(buf, sizeof(buf), "Pagacap: First to %d", max(score1, score2) + 1); - msg = buf; + int cap = max(score1, score2) + 1; + if (score1 == score2) ++cap; + + if (cap >= 13) { + msg = "Point cap: First to 13"; + } else { + char buf[32]; + snprintf(buf, sizeof(buf), "Pagacap: First to %d", cap); + msg = buf; + } } ui->autocomment_edit->setText(QString::fromStdString(msg)); + + map param; + param["autocomment_on_clock_limit"] = ui->autoshow_autocomment->isChecked() ? "1" : "0"; + param["autocomment"] = msg; + ws->send_command("update " + serialize_as_json(param)); } void MainWindow::show_scorebug_clicked() { - acmp->send_command("cg 1 invoke 1 stopcarousel"); - acmp->send_command("cg 1 invoke 1 hidetable"); - acmp->send_command("cg 1 invoke 1 showscorebug"); + ws->send_command("eval stopcarousel()"); + ws->send_command("eval hidetable()"); + ws->send_command("eval showscorebug()"); } void MainWindow::show_group_clicked(const std::string &group_name) { map param; param["group_name"] = group_name; - acmp->send_command("cg 1 invoke 1 stopcarousel"); - acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\""); - acmp->send_command("cg 1 invoke 1 showgroup_from_state"); + ws->send_command("eval stopcarousel()"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval showgroup_from_state()"); +} + +void MainWindow::show_roster_clicked(const std::string &team_code) +{ + map param; + param["team_code"] = team_code; + ws->send_command("eval stopcarousel()"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval showroster_from_state()"); } void MainWindow::show_schedule_clicked() { - acmp->send_command("cg 1 invoke 1 stopcarousel"); - acmp->send_command("cg 1 invoke 1 showschedule"); + ws->send_command("eval stopcarousel()"); + ws->send_command("eval showschedule()"); } void MainWindow::show_carousel_clicked() { - acmp->send_command("cg 1 invoke 1 stopcarousel"); - acmp->send_command("cg 1 invoke 1 showcarousel"); + ws->send_command("eval stopcarousel()"); + ws->send_command("eval showcarousel()"); +} + +void MainWindow::show_roster_carousel_clicked() +{ + map param; + param["team1"] = escape_html(ui->initials_1_edit->text().toStdString()); + param["team2"] = escape_html(ui->initials_2_edit->text().toStdString()); + ws->send_command("eval stopcarousel()"); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval showrostercarousel_from_state()"); } void MainWindow::show_nothing_clicked() { - acmp->send_command("cg 1 invoke 1 hidescorebug"); - acmp->send_command("cg 1 invoke 1 stopcarousel"); - acmp->send_command("cg 1 invoke 1 hidetable"); + ws->send_command("eval hidescorebug()"); + ws->send_command("eval stopcarousel()"); + ws->send_command("eval hidetable()"); +} + +void MainWindow::udp_thread_func(int port) +{ + int sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP); + if (sock == -1) { + perror("socket"); + exit(1); + } + + int one = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) { + perror("setsockopt"); + exit(1); + } + + sockaddr_in6 saddr6; + memset(&saddr6, 0, sizeof(saddr6)); + saddr6.sin6_family = AF_INET6; + inet_pton(AF_INET6, "::", &saddr6.sin6_addr); + saddr6.sin6_port = htons(port); + if (bind(sock, (sockaddr *)&saddr6, sizeof(saddr6)) == -1) { + perror("bind"); + exit(1); + } + + for ( ;; ) { + char buf[4096]; + int err = recv(sock, buf, sizeof(buf), 0); + if (err == -1) { + perror("recv"); + exit(1); + } + + post_to_main_thread([buf, err, port, this] { + bt6000_message_received(string(buf, err), port); + }); + } +} + +int parse_digit(char ch) +{ + if (ch >= '0' && ch <= '9') { + return ch - '0'; + } + return 0; +} + +int parse_clock(char ch1, char ch2) +{ + int s1 = parse_digit(ch1); + int s2 = parse_digit(ch2); + return s1 * 10 + s2; +} + +int parse_score(char ch1, char ch2, char ch3) +{ + int s1 = parse_digit(ch1); + int s2 = parse_digit(ch2); + int s3 = parse_digit(ch3); + return s1 * 100 + s2 * 10 + s3; +} + +void MainWindow::bt6000_message_received(const string &msg, int port) +{ + fprintf(stderr, "BT6000 message: '%s' (port %d)\n", msg.c_str(), port); + if (port == 6001) { + if (!ui->bt6000_2_enable->isChecked()) { + return; + } + } else { + if (!ui->bt6000_enable->isChecked()) { + return; + } + } + + if (msg.size() >= 9 && msg[0] == 'G' && msg[1] == '0' && msg[2] == '1') { + // G01: Game clock, period number, and number of time-outs. + bool clock_running = !(msg[3] & 0x02); +// bool klaxon = (msg[3] & 0x04); + int minutes = parse_clock(msg[5], msg[6]); + int seconds = parse_clock(msg[7], msg[8]); + + map param; + param["clock_min"] = to_string(minutes); + param["clock_sec"] = to_string(seconds); + ws->send_command("update " + serialize_as_json(param)); + + if (port == 6001) { + ws->send_command("eval adjustclock2fromstate()"); + if (clock_running) { + ws->send_command("eval startclock2()"); + } else { + ws->send_command("eval stopclock2()"); + } + } else { + ws->send_command("eval adjustclockfromstate()"); + if (clock_running) { + ws->send_command("eval startclock()"); + } else { + ws->send_command("eval stopclock()"); + } + } + } + if (msg.size() >= 10 && msg[0] == 'G' && msg[1] == '0' && msg[2] == '2') { + int score1 = parse_score(msg[4], msg[5], msg[6]); + int score2 = parse_score(msg[7], msg[8], msg[9]); + if (port == 6001) { + map param; + param["score1"] = to_string(score1); + param["score2"] = to_string(score2); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setscore2()"); + } else { + ui->score_1_box->setValue(score1); + ui->score_2_box->setValue(score2); + set_score_clicked(); + } + } + + // Ignore type 3 (penalties) and type 4 (timeouts). }