From 0195e13bdc4a0aa84f683fcbd6143ae28585591a Mon Sep 17 00:00:00 2001 From: Juliane Holzt Date: Tue, 23 Jul 2019 21:47:55 +0200 Subject: [PATCH] Implement proposed changes to Broadcast --- src/WSRequestHandler_General.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/WSRequestHandler_General.cpp b/src/WSRequestHandler_General.cpp index 3b278bd0..fce08ab7 100644 --- a/src/WSRequestHandler_General.cpp +++ b/src/WSRequestHandler_General.cpp @@ -235,12 +235,12 @@ HandlerResponse WSRequestHandler::HandleGetStats(WSRequestHandler* req) { * Broadcast some Data (String) to all connected Websocket-Clients * * @param {String} `realm` Some Identifier to be choosen by the client - * @param {String} `data` User-defined data String + * @param {Object} `data` User-defined data String * - * @api requests - * @name Authenticate + * @api general + * @name BroadcastWebSocketMessage * @category general - * @since 0.3 + * @since 4.7.0 */ HandlerResponse WSRequestHandler::HandleBroadcastWebSocketMessage(WSRequestHandler* req) { if (!req->hasField("realm") || !req->hasField("data")) { @@ -248,13 +248,13 @@ HandlerResponse WSRequestHandler::HandleBroadcastWebSocketMessage(WSRequestHandl } QString realm = obs_data_get_string(req->data, "realm"); - QString data = obs_data_get_string(req->data, "data"); + OBSDataAutoRelease data = obs_data_get_obj(req->data, "data"); if (realm.isEmpty()) { return req->SendErrorResponse("realm not specified!"); } - if (data.isEmpty()) { + if (!data) { return req->SendErrorResponse("data not specified!"); } @@ -262,7 +262,7 @@ HandlerResponse WSRequestHandler::HandleBroadcastWebSocketMessage(WSRequestHandl OBSDataAutoRelease broadcastData = obs_data_create(); obs_data_set_string(broadcastData, "realm", realm.toUtf8().constData()); - obs_data_set_string(broadcastData, "data", data.toUtf8().constData()); + obs_data_set_obj(broadcastData, "data", data); events->broadcastUpdate("BroadcastWebSocketMessage", broadcastData);