Skip to content

Commit 98c65cd

Browse files
tytan652tytan652
committed
Add procedure handler based API
1 parent e873fb0 commit 98c65cd

11 files changed

+1005
-6
lines changed

‎CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ legacy_check()
44

55
option(ENABLE_BROWSER "Enable browser source plugin (required Chromium Embedded Framework)" OFF)
66

7+
add_subdirectory(lib)
8+
79
if(NOT ENABLE_BROWSER)
810
target_disable(obs-browser)
911
target_disable_feature(obs-browser "Browser sources are not enabled by default (set CEF_ROOT_DIR and ENABLE_BROWSER)")
@@ -38,6 +40,8 @@ target_sources(
3840
deps/signal-restore.hpp
3941
deps/wide-string.cpp
4042
deps/wide-string.hpp
43+
obs-browser-api-impl.cpp
44+
obs-browser-api-impl.hpp
4145
obs-browser-plugin.cpp
4246
obs-browser-source-audio.cpp
4347
obs-browser-source.cpp
@@ -46,7 +50,7 @@ target_sources(
4650
target_include_directories(obs-browser PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps")
4751

4852
target_compile_features(obs-browser PRIVATE cxx_std_17)
49-
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
53+
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::browser-api nlohmann_json::nlohmann_json)
5054

5155
if(OS_WINDOWS)
5256
include(cmake/os-windows.cmake)

‎cmake/feature-panels.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ target_compile_definitions(browser-panels INTERFACE BROWSER_AVAILABLE)
1212
target_sources(
1313
obs-browser
1414
PRIVATE # cmake-format: sortable
15-
panel/browser-panel-client.cpp panel/browser-panel-client.hpp panel/browser-panel-internal.hpp
16-
panel/browser-panel.cpp)
15+
obs-browser-api-impl-panel.cpp panel/browser-panel-client.cpp panel/browser-panel-client.hpp
16+
panel/browser-panel-internal.hpp panel/browser-panel.cpp)
1717

1818
target_link_libraries(obs-browser PRIVATE OBS::browser-panels Qt::Widgets)
1919

‎cmake/legacy.cmake

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ project(obs-browser)
33
option(ENABLE_BROWSER "Enable building OBS with browser source plugin (required Chromium Embedded Framework)"
44
${OS_LINUX})
55

6+
add_subdirectory(lib)
7+
68
if(NOT ENABLE_BROWSER OR NOT ENABLE_UI)
79
message(STATUS "OBS: DISABLED obs-browser")
810
message(
@@ -54,6 +56,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/browser-config.h.in ${CMAKE_BINARY_DI
5456
target_sources(
5557
obs-browser
5658
PRIVATE obs-browser-plugin.cpp
59+
obs-browser-api-impl.cpp
60+
obs-browser-api-impl.hpp
5761
obs-browser-source.cpp
5862
obs-browser-source.hpp
5963
obs-browser-source-audio.cpp
@@ -76,13 +80,13 @@ target_sources(
7680

7781
target_include_directories(obs-browser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps ${CMAKE_BINARY_DIR}/config)
7882

79-
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
83+
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::browser-api nlohmann_json::nlohmann_json)
8084

8185
target_compile_features(obs-browser PRIVATE cxx_std_17)
8286

83-
if(ENABLE_BROWSER_PANELS OR ENABLE_BROWSER_QT_LOOP)
84-
find_qt(COMPONENTS Widgets)
87+
find_qt(COMPONENTS Widgets)
8588

89+
if(ENABLE_BROWSER_PANELS OR ENABLE_BROWSER_QT_LOOP)
8690
set_target_properties(
8791
obs-browser
8892
PROPERTIES AUTOMOC ON
@@ -251,6 +255,8 @@ if(ENABLE_BROWSER_PANELS)
251255

252256
target_compile_definitions(obs-browser-panels INTERFACE BROWSER_AVAILABLE)
253257

258+
target_sources(obs-browser PRIVATE obs-browser-api-impl-panel.cpp obs-browser-api-impl.cpp)
259+
254260
if(ENABLE_BROWSER_QT_LOOP)
255261
target_compile_definitions(obs-browser-panels INTERFACE ENABLE_BROWSER_QT_LOOP)
256262
endif()

‎lib/CMakeLists.txt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
cmake_minimum_required(VERSION 3.22...3.25)
2+
3+
legacy_check()
4+
5+
find_package(Qt6 REQUIRED Widgets)
6+
7+
add_library(obs-browser-api INTERFACE)
8+
add_library(OBS::browser-api ALIAS obs-browser-api)
9+
10+
target_sources(obs-browser-api PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-api.hpp>
11+
$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}/obs-browser-api.hpp>)
12+
13+
target_link_libraries(obs-browser-api INTERFACE OBS::libobs Qt::Widgets)
14+
15+
target_include_directories(obs-browser-api INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
16+
"$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>")
17+
18+
set_target_properties(
19+
obs-browser-api
20+
PROPERTIES FOLDER browser
21+
PREFIX ""
22+
PUBLIC_HEADER obs-browser-api.hpp)
23+
24+
target_export(obs-browser-api)

‎lib/cmake/legacy.cmake

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
if(POLICY CMP0090)
2+
cmake_policy(SET CMP0090 NEW)
3+
endif()
4+
5+
project(obs-browser-api)
6+
7+
find_package(Qt6 REQUIRED Widgets)
8+
9+
add_library(obs-browser-api INTERFACE)
10+
add_library(OBS::browser-api ALIAS obs-browser-api)
11+
12+
target_sources(obs-browser-api PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-api.hpp>
13+
$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}/obs-browser-api.hpp>)
14+
15+
target_link_libraries(obs-browser-api INTERFACE OBS::libobs Qt::Widgets)
16+
17+
target_include_directories(obs-browser-api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
18+
$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>)
19+
20+
set_target_properties(obs-browser-api PROPERTIES FOLDER "browser" PUBLIC_HEADER obs-browser-api.hpp)
21+
22+
export_target(obs-browser-api)

‎lib/cmake/obs-browser-apiConfig.cmake.in

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@PACKAGE_INIT@
2+
3+
include(CMakeFindDependencyMacro)
4+
5+
find_dependency(libobs REQUIRED)
6+
find_package(Qt6 REQUIRED Widgets)
7+
8+
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
9+
check_required_components("@PROJECT_NAME@")

0 commit comments

Comments
 (0)