Use QT Signal in FlatBufferConnection

Author: Paulchen-Panther

src/FlatBufferConnection.cpp

@@ -11,8 +11,6 @@
 #include "hyperion_reply_generated.h"
 #include "hyperion_request_generated.h"
 
-#define QSTRING_CSTR(str) str.toLocal8Bit().constData()
-
 FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString& host, int priority, quint16 port)
 	: _socket()
 	, _origin(origin)
@@ -23,7 +21,7 @@ FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString&
 	, _registered(false)
 {
 	connect(&_socket, &QTcpSocket::readyRead, this, &FlatBufferConnection::readData, Qt::UniqueConnection);
-	connect(&_socket, &QTcpSocket::disconnected, [=]() { this->logMessage("Connection to Hyperion server was closed"); });
+	connect(&_socket, &QTcpSocket::disconnected, this, &FlatBufferConnection::serverDisconnected);
 
 	// init connect
 	connectToHost();
@@ -69,18 +67,18 @@ void FlatBufferConnection::readData()
 			const hyperionnet::Reply* reply = hyperionnet::GetReply(msgData);
 			if (!parseReply(reply))
 			{
-				logMessage(QSTRING_CSTR(QString("Reply received with error: %1").arg(reply->error()->c_str())));
+				emit logMessage(QString("Reply received with error: %1").arg(reply->error()->c_str()));
 			}
 			continue;
 		}
 
-		logMessage("Unable to parse reply");
+		emit logMessage("Unable to parse reply");
 	}
 }
 
 void FlatBufferConnection::setRegister(const QString& origin, int priority)
 {
-	auto registerReq = hyperionnet::CreateRegister(_builder, _builder.CreateString(QSTRING_CSTR(origin)), priority);
+	auto registerReq = hyperionnet::CreateRegister(_builder, _builder.CreateString(origin.toLocal8Bit().constData()), priority);
 	auto req = hyperionnet::CreateRequest(_builder, hyperionnet::Command_Register, registerReq.Union());
 
 	_builder.Finish(req);
@@ -127,13 +125,13 @@ void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
 		switch (_socket.state() )
 		{
 			case QAbstractSocket::UnconnectedState:
-				logMessage(QString("No connection to Hyperion: %1:%2").arg(_host).arg(_port));
+				emit logMessage(QString("No connection to Hyperion: %1:%2").arg(_host).arg(_port));
 				break;
 			case QAbstractSocket::ConnectedState:
-				logMessage(QString("Connected to Hyperion: %1:%2").arg(_host).arg(_port));
+				emit logMessage(QString("Connected to Hyperion: %1:%2").arg(_host).arg(_port));
 				break;
 			default:
-				logMessage(QString("Connecting to Hyperion: %1:%2").arg(_host).arg(_port));
+				emit logMessage(QString("Connecting to Hyperion: %1:%2").arg(_host).arg(_port));
 				break;
 		}
 	  _prevSocketState = _socket.state();
@@ -184,13 +182,3 @@ bool FlatBufferConnection::parseReply(const hyperionnet::Reply *reply)
 	}
 	return false;
 }
-
-void FlatBufferConnection::logMessage(const QString& message)
-{
-	struct calldata call_data;
-	calldata_init(&call_data);
-	calldata_set_string(&call_data, "msg", QSTRING_CSTR(message));
-	signal_handler_t *handler = hyperion_get_signal_handler();
-	signal_handler_signal(handler, "log", &call_data);
-	calldata_free(&call_data);
-}

src/FlatBufferConnection.h

@@ -15,8 +15,6 @@
 
 #include <flatbuffers/flatbuffers.h>
 
-#include "hyperion-obs.h"
-
 const int FLATBUFFER_DEFAULT_PORT = 19400;
 
 namespace hyperionnet
@@ -66,12 +64,17 @@ public slots:
 	///
 	void setImage(const Image<ColorRgb> &image);
 
-// signals:
+signals:
 
-// 	///
-// 	/// @brief Emits whenever the server disconnected
-// 	///
-// 	void serverDisconnected();
+	///
+	/// @brief Emits whenever the server disconnected
+	///
+	void serverDisconnected();
+
+	///
+	/// @brief Emits log messages in the UI
+	///
+	void logMessage(const QString& message);
 
 private slots:
 	///
@@ -93,8 +96,6 @@ private slots:
 	///
 	bool parseReply(const hyperionnet::Reply *reply);
 
-	void logMessage(const QString& message);
-
 private:
 	/// The TCP-Socket with the connection to the server
 	QTcpSocket _socket;

src/hyperion-obs.cpp

@@ -61,27 +61,38 @@ void hyperion_signal_log(const char *msg)
 	calldata_free(&call_data);
 }
 
-void Connect(void *data)
+static void Disconnect(void *data)
 {
 	hyperion_output *out_data = static_cast<hyperion_output*>(data);
-	obs_data_t *settings = obs_output_get_settings(out_data->output);
-	if (out_data->active || out_data->client != nullptr)
+	if (out_data->client != nullptr)
 	{
 		delete out_data->client;
 		out_data->client = nullptr;
 	}
-
-	out_data->client = new FlatBufferConnection(OBS_MODULE_NAME, obs_data_get_string(settings, OBS_SETTINGS_ADDRESS), obs_data_get_int(settings, OBS_SETTINGS_PRIORITY), obs_data_get_int(settings, OBS_SETTINGS_PORT));
 }
 
-static void Disconnect(void *data)
+void Connect(void *data)
 {
 	hyperion_output *out_data = static_cast<hyperion_output*>(data);
-	if (out_data->client != nullptr)
+	if (out_data->active || out_data->client != nullptr)
 	{
 		delete out_data->client;
 		out_data->client = nullptr;
 	}
+
+	obs_data_t *settings = obs_output_get_settings(out_data->output);
+	out_data->client = new FlatBufferConnection(OBS_MODULE_NAME, obs_data_get_string(settings, OBS_SETTINGS_ADDRESS), obs_data_get_int(settings, OBS_SETTINGS_PRIORITY), obs_data_get_int(settings, OBS_SETTINGS_PORT));
+
+	QObject::connect(out_data->client, &FlatBufferConnection::serverDisconnected, [=]()
+	{
+		hyperion_signal_stop("Connection to Hyperion server was closed", true);
+		obs_output_end_data_capture(_hyperionOutput);
+	});
+
+	QObject::connect(out_data->client, &FlatBufferConnection::logMessage, [=](const QString& message)
+	{
+		hyperion_signal_log(QSTRING_CSTR(message));
+	});
 }
 
 static const char *hyperion_output_getname(void *unused)
@@ -190,7 +201,6 @@ static void hyperion_output_raw_video(void *param, struct video_data *frame)
 			memcpy((unsigned char*)outputImage.memptr() + y * outputImage.width() * 3, static_cast<unsigned char*>(RGBImage.scanLine(y)), RGBImage.width() * 3);
 		}
 
-
 		QMetaObject::invokeMethod(out_data->client, "setImage", Qt::QueuedConnection, Q_ARG(Image<ColorRgb>, outputImage));
 		pthread_mutex_unlock(&out_data->mutex);
 	}

src/hyperion-obs.h

@@ -2,9 +2,10 @@
 #define HYPERIONOBS_H
 
 #include <callback/signal.h>
-
 #include <QString>
 
+#define QSTRING_CSTR(str) str.toLocal8Bit().constData()
+
 const int DEFAULT_SIZEDECIMATION = 8;
 const int DEFAULT_PRIORITY = 150;