X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.cpp;h=6b8f7136e06c41087bb1fc393145897a036fc44a;hb=a863d093841773e0e17cc4965c073b443e195071;hp=b47a9e6d4e858731f0fba99914193536341064ad;hpb=06af07af77abe93004a384298edbc19178c1068e;p=ultimatescore

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index b47a9e6..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 \"<templateData></templateData>\"");
-	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);
@@ -143,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()
@@ -158,8 +152,8 @@ void MainWindow::set_initials_clicked()
 	map<string, string> 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()
@@ -167,8 +161,8 @@ void MainWindow::set_color_clicked()
 	map<string, string> 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()
@@ -176,8 +170,8 @@ void MainWindow::set_score_clicked()
 	map<string, string> 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();
 }
 
@@ -199,8 +193,8 @@ void MainWindow::set_clock_clicked()
 	map<string, string> 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()
@@ -208,42 +202,42 @@ void MainWindow::set_clock_limit_clicked()
 	map<string, string> 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());
-	acmp->send_command("cg 1 update 1 \"" + escape_quotes(serialize_as_json(param)) + "\"");
-	acmp->send_command("cg 1 invoke 1 setclocklimitfromstate");
+	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<string, string> 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()
@@ -254,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()
@@ -262,13 +256,13 @@ void MainWindow::show_lower_third_clicked()
 	map<string, string> 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()
@@ -279,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<string, string> 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();
 }
@@ -313,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<string, string> 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<string, string> 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()
@@ -353,14 +347,14 @@ void MainWindow::show_roster_carousel_clicked()
 	map<string, string> 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()");
 }