Add procedure handler based API

obsproject · Sep 7, 2024 · 5fba107 · 5fba107
1 parent e4e523d
commit 5fba107
Show file tree

Hide file tree

Showing 9 changed files with 966 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.16...3.25)
 
 option(ENABLE_BROWSER "Enable browser source plugin (required Chromium Embedded Framework)" OFF)
 
+include(cmake/obs-browser-api.cmake)
+
 if(NOT ENABLE_BROWSER)
   target_disable(obs-browser)
   target_disable_feature(obs-browser "Browser sources are not enabled by default (set CEF_ROOT_DIR and ENABLE_BROWSER)")
@@ -36,6 +38,8 @@ target_sources(
           deps/signal-restore.hpp
           deps/wide-string.cpp
           deps/wide-string.hpp
+          obs-browser-api-impl.cpp
+          obs-browser-api-impl.hpp
           obs-browser-plugin.cpp
           obs-browser-source-audio.cpp
           obs-browser-source.cpp
@@ -44,7 +48,7 @@ target_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 nlohmann_json::nlohmann_json)
+target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::browser-api nlohmann_json::nlohmann_json)
 
 if(OS_WINDOWS)
   include(cmake/os-windows.cmake)

diff --git a/cmake/feature-panels.cmake b/cmake/feature-panels.cmake
@@ -12,8 +12,8 @@ target_compile_definitions(browser-panels INTERFACE BROWSER_AVAILABLE)
 target_sources(
   obs-browser
   PRIVATE # cmake-format: sortable
-          panel/browser-panel-client.cpp panel/browser-panel-client.hpp panel/browser-panel-internal.hpp
-          panel/browser-panel.cpp)
+          obs-browser-api-impl-panel.cpp panel/browser-panel-client.cpp panel/browser-panel-client.hpp
+          panel/browser-panel-internal.hpp panel/browser-panel.cpp)
 
 target_link_libraries(obs-browser PRIVATE OBS::browser-panels Qt::Widgets)
 

diff --git a/cmake/obs-browser-api.cmake b/cmake/obs-browser-api.cmake
@@ -0,0 +1,16 @@
+find_package(Qt6 REQUIRED Widgets)
+
+add_library(obs-browser-api INTERFACE)
+add_library(OBS::browser-api ALIAS obs-browser-api)
+
+target_sources(obs-browser-api PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/obs-browser-api.hpp>
+                                      $<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}/obs-browser-api.hpp>)
+
+target_link_libraries(obs-browser-api INTERFACE OBS::libobs Qt::Widgets)
+
+target_include_directories(obs-browser-api INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/lib"
+                                                     "$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>")
+
+set_target_properties(obs-browser-api PROPERTIES PREFIX "" PUBLIC_HEADER lib/obs-browser-api.hpp)
+
+target_export(obs-browser-api)
diff --git a/cmake/obs-browser-apiConfig.cmake.in b/cmake/obs-browser-apiConfig.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(libobs REQUIRED)
+find_package(Qt6 REQUIRED Widgets)
+
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+check_required_components("@PROJECT_NAME@")