X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.cpp;h=6b8f7136e06c41087bb1fc393145897a036fc44a;hb=3c3a5c028bed3922840a2b5ad7ab861fca092582;hp=e92653a9cc4ec8e58dde659a95b01c6d4151b79a;hpb=b2c2eff985a98a2a3979881cdc92e7a0286c2e6b;p=ultimatescore
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index e92653a..6b8f713 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -52,7 +52,7 @@ string escape_quotes(const string &str)
{
string s = "";
for (char ch : str) {
- if (ch == '"' || ch == '\\') {
+ if (ch == '"') {
s += '\\';
}
s += ch;
@@ -84,19 +84,15 @@ 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();
-
- 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_color_btn, &QPushButton::clicked, this, &MainWindow::set_color_clicked);
connect(ui->set_score_btn, &QPushButton::clicked, this, &MainWindow::set_score_clicked);
@@ -107,6 +103,7 @@ 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);
@@ -142,14 +139,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()
@@ -157,8 +152,8 @@ 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_color_clicked()
@@ -166,8 +161,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()
@@ -175,8 +170,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();
}
@@ -198,42 +193,51 @@ 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::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()
@@ -244,7 +248,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()
@@ -252,13 +256,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()
@@ -269,12 +273,12 @@ void MainWindow::quick_lower_third_activate()
} else if (code == "B") {
add_goal(ui->score_2_box, 1);
} else if (code == "C") {
- acmp->send_command("cg 1 invoke 1 hidelowerthird");
+ 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();
}
@@ -303,39 +307,39 @@ void MainWindow::autocomment_update()
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;
- 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 showroster_from_state");
+ 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()
@@ -343,14 +347,14 @@ 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());
- 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 showrostercarousel_from_state");
+ 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()");
}