Fix obs29 compilation issues (#31)

* Fix nlohmann issues

* fix a link issue

* fix macOS helper names

* clang format

* legacy helper name

Author: eugen15

CMakeLists.txt

@@ -20,36 +20,38 @@ add_library(OBS::browser ALIAS obs-browser)
 option(ENABLE_BROWSER_PANELS "Enable Qt web browser panel support" ON)
 mark_as_advanced(ENABLE_BROWSER_PANELS)
 
-target_sources(
-  obs-browser
-  PRIVATE obs-browser-plugin.cpp
-          obs-browser-source.cpp
-          obs-browser-source.hpp
-          obs-browser-source-audio.cpp
-          browser-app.cpp
-          browser-app.hpp
-          browser-client.cpp
-          browser-mac.mm
-          browser-mac.h
-          browser-client.hpp
-          browser-scheme.cpp
-          browser-scheme.hpp
-          browser-version.h
-          cef-headers.hpp
-          deps/json11/json11.cpp
-          deps/json11/json11.hpp
-          deps/base64/base64.cpp
-          deps/base64/base64.hpp
-          deps/wide-string.cpp
-          deps/wide-string.hpp
-          deps/signal-restore.cpp
-          deps/signal-restore.hpp
-          deps/obs-websocket-api/obs-websocket-api.h)
+set(obs-browser_SOURCES
+  obs-browser-plugin.cpp
+  obs-browser-source.cpp
+  obs-browser-source.hpp
+  obs-browser-source-audio.cpp
+  browser-app.cpp
+  browser-app.hpp
+  browser-client.cpp
+  browser-client.hpp
+  browser-scheme.cpp
+  browser-scheme.hpp
+  browser-version.h
+  cef-headers.hpp
+  deps/base64/base64.cpp
+  deps/base64/base64.hpp
+  deps/wide-string.cpp
+  deps/wide-string.hpp
+  deps/signal-restore.cpp
+  deps/signal-restore.hpp
+  deps/obs-websocket-api/obs-websocket-api.h browser-mac.mm browser-mac.h)
 
+if(OS_MACOS)
+  list(APPEND obs-browser_SOURCES
+    browser-mac.mm
+    browser-mac.h)
+endif()
+
+target_sources(obs-browser PRIVATE ${obs-browser_SOURCES})
 target_include_directories(obs-browser PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps")
 
 target_compile_features(obs-browser PRIVATE cxx_std_17)
-target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api)
+target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
 
 if(OS_WINDOWS)
   include(cmake/os-windows.cmake)

browser-app.cpp

@@ -18,7 +18,6 @@
 
 #include "browser-app.hpp"
 #include "browser-version.h"
-//#include <json11/json11.hpp>
 #include <iostream>
 #include <mutex>
 #include <nlohmann/json.hpp>

browser-client.cpp

@@ -19,7 +19,6 @@
 #include "browser-client.hpp"
 #include "obs-browser-source.hpp"
 #include "base64/base64.hpp"
-//#include "json11/json11.hpp"
 #include <nlohmann/json.hpp>
 //#include <obs-frontend-api.h>
 #include <obs.hpp>

browser-mac.h

@@ -45,7 +45,7 @@ void ExecuteTask(MessageTask task);
 void ExecuteSyncTask(MessageTask task);
 void DoCefMessageLoop(int ms);
 void Process();
-#if 0 // REMOVE_DUPLICATE
+#if 0  // REMOVE_DUPLICATE
 void QueueBrowserTask(CefRefPtr<CefBrowser> browser, BrowserFunc func);
 #endif // REMOVE_DUPLICATE
 bool isMainThread();

browser-mac.mm

@@ -16,7 +16,6 @@
 
 ******************************************************************************/
 
-#include <obs-module.h>
 #include "browser-mac.h"
 #include <mach-o/dyld.h>
 #include <sys/types.h>
@@ -46,32 +45,30 @@ bool ExecuteNextBrowserTask()
 
 void ExecuteTask(MessageTask task)
 {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        blog(LOG_INFO, "ExecuteTask");
-        task();
-    });
+	dispatch_async(dispatch_get_main_queue(), ^{
+		task();
+	});
 }
 
 void ExecuteSyncTask(MessageTask task)
 {
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        blog(LOG_INFO, "ExecuteSyncTask");
-        task();
-    });
+	dispatch_sync(dispatch_get_main_queue(), ^{
+		task();
+	});
 }
 
 void DoCefMessageLoop(int)
 {
-    dispatch_async(dispatch_get_main_queue(), ^{
+	dispatch_async(dispatch_get_main_queue(), ^{
 		CefDoMessageLoopWork();
-    });
+	});
 }
 
 void Process()
 {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        CefDoMessageLoopWork();
-    });
+	dispatch_async(dispatch_get_main_queue(), ^{
+		CefDoMessageLoopWork();
+	});
 }
 
 #if 0 // REMOVE_DUPLICATE
@@ -88,25 +85,29 @@ void QueueBrowserTask(CefRefPtr<CefBrowser> browser, BrowserFunc func)
 
 bool isMainThread()
 {
-    return [NSThread isMainThread];
+	return [NSThread isMainThread];
 }
 
 std::string getExecutablePath()
 {
-    char path[1024];
-    uint32_t size = sizeof(path);
-    _NSGetExecutablePath(path, &size);
-    return path;
+	char path[1024];
+	uint32_t size = sizeof(path);
+	_NSGetExecutablePath(path, &size);
+	return path;
 }
 
 bool isHighThanBigSur()
 {
-    char buf[100];
-    size_t buflen = 100;
-    if (sysctlbyname("machdep.cpu.brand_string", &buf, &buflen, NULL, 0) < 0)
-        return false;
-
-    NSOperatingSystemVersion OSversion = [NSProcessInfo processInfo].operatingSystemVersion;
-    return ((OSversion.majorVersion >= 10 && OSversion.minorVersion >= 16) ||
-        OSversion.majorVersion >= 11) && strcmp("Apple M1", buf) != 0;
+	char buf[100];
+	size_t buflen = 100;
+	if (sysctlbyname("machdep.cpu.brand_string", &buf, &buflen, NULL, 0) <
+	    0)
+		return false;
+
+	NSOperatingSystemVersion OSversion =
+		[NSProcessInfo processInfo].operatingSystemVersion;
+	return ((OSversion.majorVersion >= 10 &&
+		 OSversion.minorVersion >= 16) ||
+		OSversion.majorVersion >= 11) &&
+	       strcmp("Apple M1", buf) != 0;
 }

cmake/legacy.cmake

@@ -1,9 +1,9 @@
-project(obs-browser)
+roject(obs-browser)
 
 option(ENABLE_BROWSER "Enable building OBS with browser source plugin (required Chromium Embedded Framework)"
        ${OS_LINUX})
 
-if(NOT ENABLE_BROWSER)
+if(NOT ENABLE_BROWSER OR NOT ENABLE_UI)
   message(STATUS "OBS:  DISABLED   obs-browser")
   message(
     WARNING
@@ -32,6 +32,8 @@ if(NOT TARGET CEF::Wrapper)
     FATAL_ERROR "OBS:    -        Unable to find CEF Libraries - set CEF_ROOT_DIR or configure with ENABLE_BROWSER=OFF")
 endif()
 
+find_package(nlohmann_json REQUIRED)
+
 add_library(obs-browser MODULE)
 add_library(OBS::browser ALIAS obs-browser)
 
@@ -63,8 +65,6 @@ target_sources(
           browser-scheme.hpp
           browser-version.h
           cef-headers.hpp
-          deps/json11/json11.cpp
-          deps/json11/json11.hpp
           deps/base64/base64.cpp
           deps/base64/base64.hpp
           deps/wide-string.cpp
@@ -76,7 +76,7 @@ target_sources(
 
 target_include_directories(obs-browser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps ${CMAKE_BINARY_DIR}/config)
 
-target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api)
+target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
 
 target_compile_features(obs-browser PRIVATE cxx_std_17)
 
@@ -96,9 +96,9 @@ if(NOT OS_MACOS OR ENABLE_BROWSER_LEGACY)
   add_executable(obs-browser-page)
 
   target_sources(obs-browser-page PRIVATE cef-headers.hpp obs-browser-page/obs-browser-page-main.cpp browser-app.cpp
-                                          browser-app.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                          browser-app.hpp)
 
-  target_link_libraries(obs-browser-page PRIVATE CEF::Library)
+  target_link_libraries(obs-browser-page PRIVATE CEF::Library nlohmann_json::nlohmann_json)
 
   target_include_directories(obs-browser-page PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/deps
                                                       ${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page)
@@ -165,8 +165,10 @@ elseif(OS_MACOS)
 
   target_link_libraries(obs-browser PRIVATE ${COREFOUNDATION} ${APPKIT} CEF::Wrapper)
 
+  target_sources(obs-browser PRIVATE macutil.mm)
+
   set(CEF_HELPER_TARGET "obs-browser-helper")
-  set(CEF_HELPER_OUTPUT_NAME "OBS Helper")
+  set(CEF_HELPER_OUTPUT_NAME "obs64 Helper")
   set(CEF_HELPER_APP_SUFFIXES "::" " (GPU):_gpu:.gpu" " (Plugin):_plugin:.plugin" " (Renderer):_renderer:.renderer")
 
   foreach(_SUFFIXES ${CEF_HELPER_APP_SUFFIXES})
@@ -192,9 +194,9 @@ elseif(OS_MACOS)
     add_executable(${_HELPER_TARGET} MACOSX_BUNDLE)
     add_executable(OBS::browser-helper${_TARGET_SUFFIX} ALIAS ${_HELPER_TARGET})
     target_sources(${_HELPER_TARGET} PRIVATE browser-app.cpp browser-app.hpp obs-browser-page/obs-browser-page-main.cpp
-                                             cef-headers.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                             cef-headers.hpp)
 
-    target_link_libraries(${_HELPER_TARGET} PRIVATE CEF::Wrapper)
+    target_link_libraries(${_HELPER_TARGET} PRIVATE CEF::Wrapper nlohmann_json::nlohmann_json)
 
     target_include_directories(${_HELPER_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/deps
                                                          ${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page)

cmake/os-linux.cmake

@@ -22,3 +22,4 @@ set_target_properties_obs(
              INSTALL_RPATH "$ORIGIN/"
              PREFIX ""
              OUTPUT_NAME obs-browser-page)
+             

cmake/os-macos.cmake

@@ -12,7 +12,7 @@ endif()
 target_link_libraries(obs-browser PRIVATE Qt::Widgets ${COREFOUNDATION} ${APPKIT} CEF::Wrapper)
 
 set(helper_basename browser-helper)
-set(helper_output_name "OBS Helper")
+set(helper_output_name "obs64 Helper")
 set(helper_suffixes "::" " (GPU):_gpu:.gpu" " (Plugin):_plugin:.plugin" " (Renderer):_renderer:.renderer")
 
 foreach(helper IN LISTS helper_suffixes)
@@ -32,7 +32,7 @@ foreach(helper IN LISTS helper_suffixes)
   add_executable(OBS::${target_name} ALIAS ${target_name})
 
   target_sources(${target_name} PRIVATE browser-app.cpp browser-app.hpp obs-browser-page/obs-browser-page-main.cpp
-                                        cef-headers.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                        cef-headers.hpp browser-mac.mm browser-mac.h)
   target_compile_definitions(${target_name} PRIVATE ENABLE_BROWSER_SHARED_TEXTURE)
   if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3)
     target_compile_options(${target_name} PRIVATE -Wno-error=unqualified-std-cast-call)
@@ -41,7 +41,7 @@ foreach(helper IN LISTS helper_suffixes)
   target_include_directories(${target_name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps"
                                                     "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page")
 
-  target_link_libraries(${target_name} PRIVATE CEF::Wrapper)
+  target_link_libraries(${target_name} PRIVATE CEF::Wrapper nlohmann_json::nlohmann_json)
 
   set_target_properties(
     ${target_name}

cmake/os-windows.cmake

@@ -13,8 +13,6 @@ target_sources(
           obs-browser-page/obs-browser-page-main.cpp
           browser-app.cpp
           browser-app.hpp
-          deps/json11/json11.cpp
-          deps/json11/json11.hpp
           obs-browser-page.manifest)
 
 target_include_directories(obs-browser-helper PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps"
@@ -23,7 +21,7 @@ target_include_directories(obs-browser-helper PRIVATE "${CMAKE_CURRENT_SOURCE_DI
 target_compile_options(obs-browser-helper PRIVATE $<IF:$<CONFIG:DEBUG>,/MTd,/MT>)
 target_compile_definitions(obs-browser-helper PRIVATE ENABLE_BROWSER_SHARED_TEXTURE)
 
-target_link_libraries(obs-browser-helper PRIVATE CEF::Wrapper CEF::Library)
+target_link_libraries(obs-browser-helper PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json)
 target_link_options(obs-browser-helper PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS)
 
 set(OBS_EXECUTABLE_DESTINATION "${OBS_PLUGIN_DESTINATION}")

obs-browser-plugin.cpp

@@ -397,8 +397,7 @@ static void BrowserInit(obs_data_t *settings_obs)
 		std::string binPath = getExecutablePath();
 		binPath = binPath.substr(0,
 					 binPath.size() - strlen("/bin/obs64"));
-		binPath +=
-			"/Frameworks/Chromium Embedded Framework.framework";
+		binPath += "/Frameworks/Chromium Embedded Framework.framework";
 		CefString(&settings.framework_dir_path) = binPath;
 #endif
 		std::string obs_locale = obs_get_locale();
@@ -414,7 +413,7 @@ static void BrowserInit(obs_data_t *settings_obs)
 		BPtr<char> conf_path_abs = os_get_abs_path_ptr(conf_path);
 		CefString(&settings.locale) = obs_get_locale();
 		CefString(&settings.accept_language_list) = accepted_languages;
-	settings.persist_user_preferences = 1;
+		settings.persist_user_preferences = 1;
 		CefString(&settings.cache_path) = conf_path_abs;
 #if !defined(__APPLE__) || defined(ENABLE_BROWSER_LEGACY)
 		char *abs_path = os_get_abs_path_ptr(path.c_str());