- Added option to change priority

- Update Readme.md
- Cleanup

Author: Paulchen-Panther

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "external/obs-studio"]
-	path = external/obs-studio
-	url = https://github.com/obsproject/obs-studio
 [submodule "external/flatbuffers"]
 	path = external/flatbuffers
 	url = https://github.com/google/flatbuffers

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
+}

CMakeLists.txt

@@ -1,16 +1,89 @@
 cmake_minimum_required(VERSION 3.5)
 project(hyperion-obs)
-include(GNUInstallDirs)
+
+# Macro to get path of first sub dir of a dir, used for MAC OSX lib/header searching
+MACRO(FIRSTSUBDIR result curdir)
+  FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+  SET(dirlist "")
+  FOREACH(child ${children})
+    IF(IS_DIRECTORY ${curdir}/${child})
+      LIST(APPEND dirlist "${curdir}/${child}")
+	  	BREAK()
+    ENDIF()
+  ENDFOREACH()
+  SET(${result} ${dirlist})
+ENDMACRO()
 
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_PREFIX_PATH "${QTDIR}")
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(LIBOBS_INCLUDE_DIR "external/obs-studio/libobs")
-include(cmake/FindLibObs.cmake)
+if(UNIX)
+	include(GNUInstallDirs)
+endif()
+
+# Add project specific cmake modules (find, etc)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# enable C++11; MSVC doesn't have c++11 feature switch
+if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+	include(CheckCXXCompilerFlag)
+	CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+	CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	if (CMAKE_COMPILER_IS_GNUCXX)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi")
+	endif()
+	if(COMPILER_SUPPORTS_CXX11)
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	elseif(COMPILER_SUPPORTS_CXX0X)
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+	else()
+			message(STATUS "No support for C++11 detected. Compilation will most likely fail on your compiler")
+	endif()
+endif()
+
+# MSVC options
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+	if (NOT DEFINED ENV{Qt5_BASE_DIR})
+		FIRSTSUBDIR(SUBDIRQT "C:/Qt")
+		SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${SUBDIRQT}/msvc2019_64")
+	else()
+		message(STATUS "Qt5_BASE_DIR: $ENV{Qt5_BASE_DIR}")
+		message(STATUS "Add Qt5_BASE_DIR: $ENV{Qt5_BASE_DIR} to CMAKE_PREFIX_PATH")
+		SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "$ENV{Qt5_BASE_DIR}")
+	endif()
+
+	if (NOT DEFINED ENV{Qt5_DIR})
+		if (NOT DEFINED ENV{Qt5_BASE_DIR})
+			SET (qt_module_path "${SUBDIRQT}/msvc2019_64/lib/cmake/Qt5")
+		else ()
+			SET (qt_module_path "$ENV{Qt5_BASE_DIR}/lib/cmake/Qt5")
+		endif()
+	else()
+		SET (qt_module_path "$ENV{Qt5_DIR}")
+	endif()
+
+	message(STATUS "Add ${qt_module_path} to CMAKE_MODULE_PATH")
+	SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${qt_module_path}")
+endif()
 
-find_package(LibObs REQUIRED)
+set(OBS_SOURCE "" CACHE STRING "Where is the source code of OBS-Studio located")
+set(OBS_BUILD "" CACHE STRING "Where is the build directory of OBS-Studio located")
+
+set(LIBOBS_INCLUDE_DIR "${OBS_SOURCE}/libobs")
+set(OBS_FRONTEND_INCLUDE_DIR "${OBS_SOURCE}/UI/obs-frontend-api")
+
+if (WIN32)
+	set(LibObs_DIR "${OBS_BUILD}/libobs")
+	set(LIBOBS_LIB "${OBS_BUILD}/libobs/$<CONFIGURATION>/obs.lib")
+	set(OBS_FRONTEND_LIB "${OBS_BUILD}/UI/obs-frontend-api/$<CONFIGURATION>/obs-frontend-api.lib")
+	set(PTHREAD_LIB "${OBS_BUILD}/deps/w32-pthreads/$<CONFIGURATION>/w32-pthreads.lib")
+endif()
+
+find_package(Libobs REQUIRED)
 find_package(Qt5 COMPONENTS Core Widgets Network REQUIRED)
 
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared flatbuffers library")
@@ -20,6 +93,7 @@ add_subdirectory(external/flatbuffers)
 export(TARGETS flatc FILE "${CMAKE_BINARY_DIR}/flatc_export.cmake")
 set(FLATBUFFERS_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/external/flatbuffers/include")
 set(FLATBUFFERS_FLATC_EXECUTABLE "$<TARGET_FILE:flatc>")
+
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${FLATBUFFERS_INCLUDE_DIRS}
@@ -51,17 +125,28 @@ endforeach()
 
 set_source_files_properties(${Flatbuffer_GENERATED_FBS} PROPERTIES GENERATED TRUE)
 
-include_directories("external/obs-studio/UI/obs-frontend-api")
-
 FILE ( GLOB hyperion_obs_SOURCES "${CMAKE_SOURCE_DIR}/src/*.h" "${CMAKE_SOURCE_DIR}/src/*.cpp" )
 
 add_library(${PROJECT_NAME} MODULE
 	${hyperion_obs_SOURCES}
 	${Flatbuffer_GENERATED_FBS}
 )
-	
+
+include_directories(
+	${OBS_FRONTEND_INCLUDE_DIR}
+	${LIBOBS_INCLUDE_DIR}
+)
+
+if(UNIX)
+	target_link_libraries(${PROJECT_NAME} libobs)
+endif()
+
+if (WIN32)
+	target_link_libraries(${PROJECT_NAME} ${PTHREAD_LIB} ${LIBOBS_LIB})
+endif()
+
 target_link_libraries(${PROJECT_NAME}
-	libobs
+	${OBS_FRONTEND_LIB}
 	flatbuffers
 	Qt5::Core
 	Qt5::Widgets
@@ -76,5 +161,7 @@ endif()
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/obs-plugins)
-install(DIRECTORY locale/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/hyperion-obs/locale)
+if(UNIX)
+	install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/obs-plugins)
+	install(DIRECTORY locale/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/hyperion-obs/locale)
+endif()

README.md

@@ -11,7 +11,7 @@ The idea for this plugin originated from a fork of [Murat Seker][m-seker].
 
 ## Usage with hyperion-obs
 
-- Open OBS and select the menu entry `Tools > Hyperion Output`.
+- Open OBS and select the menu entry `Tools > Hyperion Streaming`.
 - Enter the flatbuffer destination IP and select the appropriate port.
 - Click the `Start` button.
 
@@ -25,13 +25,19 @@ The idea for this plugin originated from a fork of [Murat Seker][m-seker].
 sudo apt install qtbase5-dev libobs-dev
 ```
 
+- Get OBS Studio source code
+
+```
+git clone --recursive https://github.com/obsproject/obs-studio.git
+```
+
 - Build plugin
 
 ```
 git clone --recursive https://github.com/hyperion-project/hyperion-obs-plugin.git
 cd hyperion-obs-plugin
 mkdir build && cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+cmake -DOBS_SOURCE="../../obs-studio" -DCMAKE_INSTALL_PREFIX=/usr ..
 make -j $(nproc)
 sudo make install
 ```

external/obs-studio

@@ -3,8 +3,10 @@ UI.Title="Ausgabe an Hyperion"
 UI.AutoStart="Starte automatisch"
 UI.AutoStartTip="Starte den Stream mit dem OBS-Start."
 UI.Address="Adresse"
-UI.AddressTip="Der Hostname oder die IP-Adresse (IPv4/IPv6) desr Hyperion-Servers."
-UI.PortTip="Der beim Hyperion Server konfigurierte Flatbufferport [Default:19400]."
+UI.AddressTip="Der Hostname oder die IP-Adresse (IPv4/IPv6) des Hyperion-Servers."
+UI.PortTip="Der beim Hyperion Server konfigurierte Flatbufferport [Standard:19400]."
+UI.Priority="Priorität"
+UI.PriorityTip="Mit welche Priorität der Stream beim Hyperion-Server empfangen wird [Standard:150]"
 UI.SizeDecimation="Ausgabereduzierungsfaktor"
 UI.SizeDecimationTip="Bildverkleinerung (Faktor) ausgehend von der ursprünglichen Größe. 1 für die unveränderte/ursprüngliche Größe."
 UI.StartTip="Starte Ausgabe an Hyperion"

locale/de-DE.ini

@@ -4,7 +4,9 @@ UI.AutoStart="Auto start"
 UI.AutoStartTip="Start streaming when OBS is started."
 UI.Address="Address"
 UI.AddressTip="The hostname or IP-address (IPv4 or IPv6) of the Hyperion server."
-UI.PortTip="The Flatbuffer port as configured at the Hyperion Server [default:19400]."
+UI.PortTip="The Flatbuffer port as configured at the Hyperion Server [Default:19400]."
+UI.Priority="Priority"
+UI.PriorityTip="With which priority the stream is received at the Hyperion server [Default:150]"
 UI.SizeDecimation="Output Decimation"
 UI.SizeDecimationTip="Scale the output image down by decimation factor. 1 means no decimation (keep original size)."
 UI.StartTip="Start streaming to Hyperion"

locale/en-GB.ini

@@ -4,7 +4,9 @@ UI.AutoStart="Auto start"
 UI.AutoStartTip="Start streaming when OBS is started."
 UI.Address="Address"
 UI.AddressTip="The hostname or IP-address (IPv4 or IPv6) of the Hyperion server."
-UI.PortTip="The Flatbuffer port as configured at the Hyperion Server [default:19400]."
+UI.PortTip="The Flatbuffer port as configured at the Hyperion Server [Default:19400]."
+UI.Priority="Priority"
+UI.PriorityTip="With which priority the stream is received at the Hyperion server [Default:150]"
 UI.SizeDecimation="Output Decimation"
 UI.SizeDecimationTip="Scale the output image down by decimation factor. 1 means no decimation (keep original size)."
 UI.StartTip="Start streaming to Hyperion"

locale/en-US.ini

@@ -69,13 +69,19 @@ void FlatBufferConnection::readData()
 			const hyperionnet::Reply* reply = hyperionnet::GetReply(msgData);
 			if (!parseReply(reply))
 			{
-				qDebug() << "Reply received with error: " << reply->error();
-				_socket.close();
+				struct calldata call_data;
+				calldata_init(&call_data);
+				calldata_set_string(&call_data, "msg", QSTRING_CSTR(QString("Reply received with error: %1").arg(reply->error()->c_str())));
+				calldata_set_bool(&call_data, "running", true);
+				signal_handler_t *handler = hyperion_get_signal_handler();
+				signal_handler_signal(handler, "stop", &call_data);
+				calldata_free(&call_data);
+				delete this;
 			}
 			continue;
 		}
 
-		qDebug() << "Unable to parse reply";
+		emit logMessage("Unable to parse reply");
 	}
 }
 
@@ -128,13 +134,13 @@ void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
 		switch (_socket.state() )
 		{
 			case QAbstractSocket::UnconnectedState:
-				emit 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:
-				emit 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:
-				emit 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();
@@ -195,6 +201,9 @@ void FlatBufferConnection::disconnected()
 	signal_handler_t *handler = hyperion_get_signal_handler();
 	signal_handler_signal(handler, "stop", &call_data);
 	calldata_free(&call_data);
+
+	_timer.stop();
+	_socket.close();
 }
 
 void FlatBufferConnection::logMessage(const QString& message)