OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-03 01:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OBS:46e47c07c9dc912e0f418fbe4cec17cde7c05b45
Branches Tags
OBS:master
OBS:automated/clean-services
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4
...
compare: OBS:cd401a2131a1f8bcfe5fa818b57dcd63e2de2dc8
Branches Tags
OBS:automated/clean-services
OBS:master
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4

15 commits
46e47c07c9 ... cd401a2131

Author SHA1 Message Date
tytan652 cd401a2131 UI: Remove obs-ui-support 
The remaining files are only used by the UI, so those are restored in
the obs-studio target
 2024-06-08 12:49:12 +02:00
tytan652 20c3efd391 UI,shared: Move OBSPropertiesView to its own directory 2024-06-08 12:48:50 +02:00
tytan652 db6846fd20 frontend-tools: Remove unused source files in legacy path 2024-06-08 12:48:34 +02:00
tytan652 b9b761fe77 UI,shared: Move SliderIgnoreScroll to its own directory 2024-06-08 12:48:34 +02:00
tytan652 deb54b8e79 UI,shared: Move VScrollArea to its own directory 2024-06-08 12:48:34 +02:00
tytan652 437ef58666 UI,shared: Move OBSPlainTextEdit to its own directory 2024-06-08 12:48:33 +02:00
tytan652 69eae11019 UI,shared: Move Qt Wrappers to its own directory 2024-06-08 12:48:13 +02:00
tytan652 1c4966d471 UI: Move QTToGSWindow outside of Qt wrappers 2024-06-08 12:47:30 +02:00
tytan652 988b5e4563 deps,shared,plugins: Move opts-parser to shared folder 2024-06-08 12:47:30 +02:00
tytan652 f022870923 deps,shared,frontend-tools: Move obs-scripting to shared folder 2024-06-08 12:47:30 +02:00
tytan652 6b4f3711d5 deps,shared,obs-ffmpeg: Move media-playback to shared folder 2024-06-08 12:47:30 +02:00
tytan652 f154b4a331 deps,shared,win-capture: Move ipc-util to shared folder 2024-06-08 12:47:30 +02:00
tytan652 51c17032be deps,shared,obs-outputs: Move happy-eyeballs to shared folder 2024-06-08 12:47:30 +02:00
tytan652 f650cdf6bb deps,shared,plugins: Move file-updater to shared folder 2024-06-08 12:47:30 +02:00
tytan652 e38f6754eb Add shared folder in gitignore and format scripts 2024-06-08 12:47:30 +02:00
151 changed files with 420 additions and 285 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -9,6 +9,7 @@
!/docs
!/libobs*
!/plugins
!/shared
!/test
!/UI
!.cirrus.xml

2
UI/absolute-slider.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <QMouseEvent>
#include "slider-ignorewheel.hpp"
#include <slider-ignorewheel.hpp>
class AbsoluteSlider : public SliderIgnoreScroll {
Q_OBJECT

2
UI/adv-audio-control.cpp
View file

@ -5,7 +5,7 @@
#include <QComboBox>
#include <QCheckBox>
#include <cmath>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "adv-audio-control.hpp"
#include "window-basic-main.hpp"

2
UI/api-interface.cpp
View file

@ -1,6 +1,6 @@
#include <obs-frontend-internal.hpp>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include "window-basic-main-outputs.hpp"

2
UI/auth-listener.cpp
View file

@ -4,9 +4,9 @@
#include <QRegularExpressionMatch>
#include <QString>
#include <QtNetwork/QTcpSocket>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#define LOGO_URL "https://obsproject.com/assets/images/new_icon_small-r.png"

2
UI/auth-youtube.cpp
View file

@ -8,6 +8,7 @@
#include <QHBoxLayout>
#include <QUrl>
#include <QRandomGenerator>
#include <qt-wrappers.hpp>
#ifdef WIN32
#include <windows.h>
@ -18,7 +19,6 @@
#include "auth-listener.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "ui-config.h"
#include "youtube-api-wrappers.hpp"
#include "window-basic-main.hpp"

52
UI/cmake/legacy.cmake
View file

@ -71,6 +71,28 @@ find_package(CURL REQUIRED)
add_subdirectory(frontend-plugins)
add_executable(obs)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
if(NOT TARGET OBS::qt-plain-text-edit)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
endif()
if(NOT TARGET OBS::qt-slider-ignorewheel)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
endif()
if(NOT TARGET OBS::qt-vertical-scroll-area)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
endif()
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets Network Svg Xml COMPONENTS_LINUX Gui DBus)
target_link_libraries(obs PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
@ -147,8 +169,6 @@ target_sources(
platform.hpp
qt-display.cpp
qt-display.hpp
qt-wrappers.cpp
qt-wrappers.hpp
ui-validation.cpp
ui-validation.hpp
multiview.cpp
@ -171,8 +191,6 @@ target_sources(
basic-controls.cpp
basic-controls.hpp
clickable-label.hpp
double-slider.cpp
double-slider.hpp
horizontal-scroll-area.cpp
horizontal-scroll-area.hpp
item-widget-helpers.cpp
@ -193,22 +211,13 @@ target_sources(
menu-button.hpp
mute-checkbox.hpp
noncheckable-button.hpp
plain-text-edit.cpp
plain-text-edit.hpp
properties-view.cpp
properties-view.hpp
properties-view.moc.hpp
remote-text.cpp
remote-text.hpp
scene-tree.cpp
scene-tree.hpp
screenshot-obj.hpp
slider-ignorewheel.cpp
slider-ignorewheel.hpp
source-label.cpp
source-label.hpp
spinbox-ignorewheel.cpp
spinbox-ignorewheel.hpp
source-tree.cpp
source-tree.hpp
url-push-button.cpp
@ -217,8 +226,6 @@ target_sources(
undo-stack-obs.hpp
volume-control.cpp
volume-control.hpp
vertical-scroll-area.cpp
vertical-scroll-area.hpp
visibility-item-widget.cpp
visibility-item-widget.hpp)
@ -306,8 +313,19 @@ target_compile_features(obs PRIVATE cxx_std_17)
target_include_directories(obs PRIVATE ${CMAKE_SOURCE_DIR}/deps/json11)
target_link_libraries(obs PRIVATE CURL::libcurl FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat OBS::libobs
OBS::frontend-api)
target_link_libraries(
obs
PRIVATE CURL::libcurl
FFmpeg::avcodec
FFmpeg::avutil
FFmpeg::avformat
OBS::libobs
OBS::frontend-api
OBS::qt-wrappers
OBS::qt-plain-text-edit
OBS::qt-vertical-scroll-area
OBS::qt-slider-ignorewheel
OBS::properties-view)
set_target_properties(obs PROPERTIES FOLDER "frontend")

46
UI/cmake/ui-elements.cmake
View file

@ -1,32 +1,23 @@
add_library(obs-ui-support INTERFACE)
add_library(OBS::ui-support ALIAS obs-ui-support)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
target_sources(
obs-ui-support
INTERFACE # cmake-format: sortable
clickable-label.hpp
double-slider.cpp
double-slider.hpp
horizontal-scroll-area.cpp
horizontal-scroll-area.hpp
plain-text-edit.cpp
plain-text-edit.hpp
properties-view.cpp
properties-view.hpp
properties-view.moc.hpp
qt-wrappers.cpp
qt-wrappers.hpp
slider-ignorewheel.cpp
slider-ignorewheel.hpp
spinbox-ignorewheel.cpp
spinbox-ignorewheel.hpp
vertical-scroll-area.cpp
vertical-scroll-area.hpp)
if(NOT TARGET OBS::qt-plain-text-edit)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
endif()
target_include_directories(obs-ui-support INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
target_compile_options(obs-ui-support INTERFACE $<$<PLATFORM_ID:Linux>:-Wno-error=enum-conversion>)
if(NOT TARGET OBS::qt-slider-ignorewheel)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
endif()
target_link_libraries(obs-studio PRIVATE OBS::ui-support)
if(NOT TARGET OBS::qt-vertical-scroll-area)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
endif()
target_link_libraries(obs-studio PRIVATE OBS::properties-view OBS::qt-plain-text-edit OBS::qt-slider-ignorewheel
OBS::qt-vertical-scroll-area)
target_sources(
obs-studio
@ -40,10 +31,13 @@ target_sources(
balance-slider.hpp
basic-controls.cpp
basic-controls.hpp
clickable-label.hpp
context-bar-controls.cpp
context-bar-controls.hpp
focus-list.cpp
focus-list.hpp
horizontal-scroll-area.cpp
horizontal-scroll-area.hpp
hotkey-edit.cpp
hotkey-edit.hpp
item-widget-helpers.cpp

6
UI/cmake/ui-qt.cmake
View file

@ -8,7 +8,11 @@ if(OS_LINUX
find_package(Qt6 REQUIRED Gui DBus)
endif()
target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network OBS::qt-wrappers)
set_target_properties(
obs-studio

2
UI/context-bar-controls.cpp
View file

@ -1,8 +1,8 @@
#include "window-basic-main.hpp"
#include "context-bar-controls.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QStandardItemModel>
#include <QColorDialog>
#include <QFontDialog>

2
UI/frontend-plugins/aja-output-ui/AJAOutputUI.h
View file

@ -1,9 +1,9 @@
#pragma once
#include <QDialog>
#include <properties-view.hpp>
#include "ui_output.h"
#include "../../UI/properties-view.hpp"
namespace aja {
class CardManager;

6
UI/frontend-plugins/aja-output-ui/CMakeLists.txt
View file

@ -23,6 +23,10 @@ if(NOT TARGET OBS::aja-support)
add_subdirectory("${CMAKE_SOURCE_DIR}/plugins/aja" "${CMAKE_BINARY_DIR}/plugins/aja")
endif()
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
add_library(aja-output-ui MODULE)
add_library(OBS::aja-output-ui ALIAS aja-output-ui)
@ -40,7 +44,7 @@ target_link_libraries(
PRIVATE OBS::libobs
OBS::aja-support
OBS::frontend-api
OBS::ui-support
OBS::properties-view
Qt::Widgets
AJA::LibAJANTV2
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>

24
UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake
View file

@ -9,6 +9,10 @@ find_package(LibAJANTV2 REQUIRED)
add_library(aja-output-ui MODULE)
add_library(OBS::aja-output-ui ALIAS aja-output-ui)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -45,24 +49,10 @@ target_sources(
${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.cpp
${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.hpp
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.cpp
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp
${CMAKE_SOURCE_DIR}/UI/double-slider.cpp
${CMAKE_SOURCE_DIR}/UI/double-slider.hpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.hpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp)
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp)
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api Qt::Widgets AJA::LibAJANTV2)
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets
AJA::LibAJANTV2)
if(OS_MACOS)
find_library(IOKIT_FRAMEWORK Iokit)

6
UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
View file

@ -20,6 +20,10 @@ endif()
add_library(decklink-output-ui MODULE)
add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
target_sources(decklink-output-ui PRIVATE forms/output.ui)
target_sources(decklink-output-ui PRIVATE DecklinkOutputUI.cpp DecklinkOutputUI.h decklink-ui-main.cpp
@ -31,7 +35,7 @@ target_link_libraries(
decklink-output-ui
PRIVATE OBS::libobs
OBS::frontend-api
OBS::ui-support
OBS::properties-view
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>>"
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>

2
UI/frontend-plugins/decklink-output-ui/DecklinkOutputUI.h
View file

@ -1,9 +1,9 @@
#pragma once
#include <QDialog>
#include <properties-view.hpp>
#include "ui_output.h"
#include "../../UI/properties-view.hpp"
class DecklinkOutputUI : public QDialog {
Q_OBJECT

29
UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake
View file

@ -7,6 +7,10 @@ endif()
add_library(decklink-output-ui MODULE)
add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -22,29 +26,10 @@ endif()
target_sources(decklink-output-ui PRIVATE forms/output.ui)
target_sources(
decklink-output-ui
PRIVATE DecklinkOutputUI.cpp
DecklinkOutputUI.h
decklink-ui-main.cpp
decklink-ui-main.h
${CMAKE_SOURCE_DIR}/UI/double-slider.cpp
${CMAKE_SOURCE_DIR}/UI/double-slider.hpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.hpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp)
target_sources(decklink-output-ui PRIVATE DecklinkOutputUI.cpp DecklinkOutputUI.h decklink-ui-main.cpp
decklink-ui-main.h)
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api Qt::Widgets)
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets)
target_compile_features(decklink-output-ui PRIVATE cxx_std_17)

18
UI/frontend-plugins/frontend-tools/CMakeLists.txt
View file

@ -14,6 +14,18 @@ endif()
add_library(frontend-tools MODULE)
add_library(OBS::frontend-tools ALIAS frontend-tools)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
if(NOT TARGET OBS::qt-plain-text-edit)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
endif()
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
target_sources(
frontend-tools
PRIVATE # cmake-format: sortable
@ -45,13 +57,15 @@ target_link_libraries(
frontend-tools
PRIVATE OBS::frontend-api
OBS::libobs
OBS::ui-support
OBS::properties-view
OBS::qt-plain-text-edit
OBS::qt-wrappers
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa>>"
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/obs-scripting" "${CMAKE_BINARY_DIR}/deps/obs-scripting")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
target_sources(frontend-tools PRIVATE scripts.cpp scripts.hpp)

44
UI/frontend-plugins/frontend-tools/cmake/legacy.cmake
View file

@ -3,6 +3,18 @@ project(frontend-tools)
add_library(frontend-tools MODULE)
add_library(OBS::frontend-tools ALIAS frontend-tools)
if(NOT TARGET OBS::properties-view)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
endif()
if(NOT TARGET OBS::qt-plain-text-edit)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
endif()
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -19,40 +31,20 @@ endif()
target_sources(frontend-tools PRIVATE forms/auto-scene-switcher.ui forms/captions.ui forms/output-timer.ui
forms/scripts.ui)
target_sources(
frontend-tools
PRIVATE frontend-tools.c
auto-scene-switcher.hpp
auto-scene-switcher.cpp
output-timer.hpp
tool-helpers.hpp
output-timer.cpp
${CMAKE_SOURCE_DIR}/UI/double-slider.cpp
${CMAKE_SOURCE_DIR}/UI/double-slider.hpp
${CMAKE_SOURCE_DIR}/UI/horizontal-scroll-area.cpp
${CMAKE_SOURCE_DIR}/UI/horizontal-scroll-area.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.cpp
${CMAKE_SOURCE_DIR}/UI/plain-text-edit.hpp)
target_sources(frontend-tools PRIVATE frontend-tools.c auto-scene-switcher.hpp auto-scene-switcher.cpp output-timer.hpp
tool-helpers.hpp output-timer.cpp)
target_compile_features(frontend-tools PRIVATE cxx_std_17)
target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::libobs Qt::Widgets)
target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit
OBS::properties-view OBS::libobs Qt::Widgets)
if(OS_POSIX AND NOT OS_MACOS)
target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)
endif()
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
target_compile_definitions(frontend-tools PRIVATE ENABLE_SCRIPTING)

6
UI/frontend-plugins/frontend-tools/scripts.cpp
View file

@ -1,8 +1,5 @@
#include "obs-module.h"
#include "scripts.hpp"
#include "../../properties-view.hpp"
#include "../../qt-wrappers.hpp"
#include "../../plain-text-edit.hpp"
#include <QFileDialog>
#include <QHBoxLayout>
@ -18,6 +15,9 @@
#include <QMenu>
#include <QUrl>
#include <QDesktopServices>
#include <qt-wrappers.hpp>
#include <plain-text-edit.hpp>
#include <properties-view.hpp>
#include <obs.hpp>
#include <obs-module.h>

2
UI/hotkey-edit.cpp
View file

@ -22,9 +22,9 @@
#include <QPointer>
#include <QStyle>
#include <QAction>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
void OBSHotkeyEdit::keyPressEvent(QKeyEvent *event)
{

2
UI/log-viewer.cpp
View file

@ -8,9 +8,9 @@
#include <QLayout>
#include <QDesktopServices>
#include <string>
#include <qt-wrappers.hpp>
#include "log-viewer.hpp"
#include "qt-wrappers.hpp"
OBSLogViewer::OBSLogViewer(QWidget *parent)
: QDialog(parent),

2
UI/media-controls.hpp
View file

@ -4,7 +4,7 @@
#include <QTimer>
#include <vector>
#include <obs.hpp>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
class Ui_MediaControls;

3
UI/obs-app.cpp
View file

@ -30,6 +30,8 @@
#include <util/cf-parser.h>
#include <obs-config.h>
#include <obs.hpp>
#include <qt-wrappers.hpp>
#include <slider-ignorewheel.hpp>
#include <QDir>
#include <QFile>
@ -38,7 +40,6 @@
#include <QProcess>
#include <QAccessible>
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "obs-proxy-style.hpp"
#include "log-viewer.hpp"

2
UI/platform-windows.cpp
View file

@ -19,9 +19,9 @@
#include <sstream>
#include "obs-config.h"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include <qt-wrappers.hpp>
#include <util/windows/win-version.h>
#include <util/platform.h>

42
UI/qt-display.cpp
View file

@ -1,11 +1,11 @@
#include "qt-display.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include <QWindow>
#include <QScreen>
#include <QResizeEvent>
#include <QShowEvent>
#include <qt-wrappers.hpp>
#include <obs-config.h>
#ifdef _WIN32
@ -13,6 +13,14 @@
#include <Windows.h>
#endif
#if !defined(_WIN32) && !defined(__APPLE__)
#include <obs-nix-platform.h>
#endif
#ifdef ENABLE_WAYLAND
#include <qpa/qplatformnativeinterface.h>
#endif
class SurfaceEventFilter : public QObject {
OBSQTDisplay *display;
@ -62,6 +70,38 @@ static inline QColor rgba_to_color(uint32_t rgba)
(rgba >> 16) & 0xFF, (rgba >> 24) & 0xFF);
}
static bool QTToGSWindow(QWindow *window, gs_window &gswindow)
{
bool success = true;
#ifdef _WIN32
gswindow.hwnd = (HWND)window->winId();
#elif __APPLE__
gswindow.view = (id)window->winId();
#else
switch (obs_get_nix_platform()) {
case OBS_NIX_PLATFORM_X11_EGL:
gswindow.id = window->winId();
gswindow.display = obs_get_nix_platform_display();
break;
#ifdef ENABLE_WAYLAND
case OBS_NIX_PLATFORM_WAYLAND: {
QPlatformNativeInterface *native =
QGuiApplication::platformNativeInterface();
gswindow.display =
native->nativeResourceForWindow("surface", window);
success = gswindow.display != nullptr;
break;
}
#endif
default:
success = false;
break;
}
#endif
return success;
}
OBSQTDisplay::OBSQTDisplay(QWidget *parent, Qt::WindowFlags flags)
: QWidget(parent, flags)
{

2
UI/remote-text.cpp
View file

@ -16,8 +16,8 @@
******************************************************************************/
#include <util/curl/curl-helper.h>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
using namespace std;

2
UI/source-tree.cpp
View file

@ -1,10 +1,10 @@
#include "window-basic-main.hpp"
#include "obs-app.hpp"
#include "source-tree.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include "source-label.hpp"
#include <qt-wrappers.hpp>
#include <obs-frontend-api.h>
#include <obs.h>

2
UI/update/mac-update.cpp
View file

@ -1,11 +1,11 @@
#include "update-helpers.hpp"
#include "shared-update.hpp"
#include "qt-wrappers.hpp"
#include "mac-update.hpp"
#include "obs-app.hpp"
#include <string>
#include <qt-wrappers.hpp>
#include <QMessageBox>
/* ------------------------------------------------------------------------ */

2
UI/update/win-update.cpp
View file

@ -3,10 +3,10 @@
#include "shared-update.hpp"
#include "update-window.hpp"
#include "remote-text.hpp"
#include "qt-wrappers.hpp"
#include "win-update.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QMessageBox>
#include <string>

3
UI/visibility-item-widget.cpp
View file

@ -1,7 +1,8 @@
#include "visibility-item-widget.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "source-label.hpp"
#include <qt-wrappers.hpp>
#include <QListWidget>
#include <QLineEdit>
#include <QHBoxLayout>

4
UI/volume-control.cpp
View file

@ -1,10 +1,12 @@
#include "window-basic-main.hpp"
#include "volume-control.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "mute-checkbox.hpp"
#include "absolute-slider.hpp"
#include "source-label.hpp"
#include <slider-ignorewheel.hpp>
#include <qt-wrappers.hpp>
#include <QFontDatabase>
#include <QHBoxLayout>
#include <QPushButton>

2
UI/window-basic-about.cpp
View file

@ -1,7 +1,7 @@
#include "window-basic-about.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
#include <qt-wrappers.hpp>
#include <util/util.hpp>
#include <util/platform.h>
#include <platform.hpp>

2
UI/window-basic-adv-audio.cpp
View file

@ -3,7 +3,7 @@
#include "item-widget-helpers.hpp"
#include "adv-audio-control.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "ui_OBSAdvAudio.h"

2
UI/window-basic-auto-config-test.cpp
View file

@ -8,10 +8,10 @@
#include <graphics/vec4.h>
#include <graphics/graphics.h>
#include <graphics/math-extra.h>
#include <qt-wrappers.hpp>
#include "window-basic-auto-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "ui_AutoConfigTestPage.h"

2
UI/window-basic-auto-config.cpp
View file

@ -2,12 +2,12 @@
#include <QScreen>
#include <obs.hpp>
#include <qt-wrappers.hpp>
#include <nlohmann/json.hpp>
#include "window-basic-auto-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "url-push-button.hpp"

2
UI/window-basic-filters.cpp
View file

@ -20,12 +20,12 @@
#include "window-basic-main.hpp"
#include "window-basic-filters.hpp"
#include "display-helpers.hpp"
#include "qt-wrappers.hpp"
#include "visibility-item-widget.hpp"
#include "item-widget-helpers.hpp"
#include "obs-app.hpp"
#include "undo-stack-obs.hpp"
#include <qt-wrappers.hpp>
#include <QMessageBox>
#include <QCloseEvent>
#include <obs-data.h>

3
UI/window-basic-filters.hpp
View file

@ -21,8 +21,7 @@
#include <QDialogButtonBox>
#include <memory>
#include <obs.hpp>
#include "properties-view.hpp"
#include <properties-view.hpp>
class OBSBasic;
class QMenu;

2
UI/window-basic-interaction.cpp
View file

@ -18,9 +18,9 @@
#include "obs-app.hpp"
#include "window-basic-interaction.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include <qt-wrappers.hpp>
#include <QKeyEvent>
#include <QCloseEvent>
#include <QScreen>

3
UI/window-basic-interaction.hpp
View file

@ -22,8 +22,7 @@
#include <functional>
#include <obs.hpp>
#include "properties-view.hpp"
#include <properties-view.hpp>
class OBSBasic;

2
UI/window-basic-main-browser.cpp
View file

@ -18,8 +18,8 @@
#include <QDir>
#include <QThread>
#include <QMessageBox>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <random>

2
UI/window-basic-main-dropfiles.cpp
View file

@ -9,9 +9,9 @@
#include <QSettings>
#endif
#include <string>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
using namespace std;

2
UI/window-basic-main-outputs.cpp
View file

@ -3,7 +3,7 @@
#include <cinttypes>
#include <QMessageBox>
#include <QPromise>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "audio-encoders.hpp"
#include "multitrack-video-error.hpp"
#include "window-basic-main.hpp"

2
UI/window-basic-main-profiles.cpp
View file

@ -21,10 +21,10 @@
#include <QMessageBox>
#include <QVariant>
#include <QFileDialog>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "window-basic-auto-config.hpp"
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
extern void DestroyPanelCookieManager();
extern void DuplicateCurrentCookieProfile(ConfigFile &config);

2
UI/window-basic-main-scene-collections.cpp
View file

@ -21,11 +21,11 @@
#include <QVariant>
#include <QFileDialog>
#include <QStandardPaths>
#include <qt-wrappers.hpp>
#include "item-widget-helpers.hpp"
#include "window-basic-main.hpp"
#include "window-importer.hpp"
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
using namespace std;

3
UI/window-basic-main-screenshot.cpp
View file

@ -17,7 +17,8 @@
#include "window-basic-main.hpp"
#include "screenshot-obj.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#ifdef _WIN32
#include <wincodec.h>

4
UI/window-basic-main-transitions.cpp
View file

@ -20,14 +20,14 @@
#include <QToolTip>
#include <QMessageBox>
#include <util/dstr.hpp>
#include <qt-wrappers.hpp>
#include <slider-ignorewheel.hpp>
#include "window-basic-main.hpp"
#include "window-basic-main-outputs.hpp"
#include "window-basic-vcam-config.hpp"
#include "display-helpers.hpp"
#include "window-namedialog.hpp"
#include "menu-button.hpp"
#include "slider-ignorewheel.hpp"
#include "qt-wrappers.hpp"
#include "obs-hotkey.h"

2
UI/window-basic-main.cpp
View file

@ -36,6 +36,7 @@
#include <QScrollBar>
#include <QTextStream>
#include <QActionGroup>
#include <qt-wrappers.hpp>
#include <util/dstr.h>
#include <util/util.hpp>
@ -67,7 +68,6 @@
#include "window-youtube-actions.hpp"
#include "youtube-api-wrappers.hpp"
#endif
#include "qt-wrappers.hpp"
#include "context-bar-controls.hpp"
#include "obs-proxy-style.hpp"
#include "display-helpers.hpp"

4
UI/window-basic-properties.cpp
View file

@ -18,10 +18,10 @@
#include "obs-app.hpp"
#include "window-basic-properties.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include "properties-view.hpp"
#include <qt-wrappers.hpp>
#include <properties-view.hpp>
#include <QCloseEvent>
#include <QScreen>
#include <QWindow>

2
UI/window-basic-settings-a11y.cpp
View file

@ -2,7 +2,7 @@
#include "window-basic-main.hpp"
#include "obs-frontend-api.h"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QColorDialog>
enum ColorPreset {

2
UI/window-basic-settings-stream.cpp
View file

@ -1,12 +1,12 @@
#include <QMessageBox>
#include <QUrl>
#include <QUuid>
#include <qt-wrappers.hpp>
#include "window-basic-settings.hpp"
#include "obs-frontend-api.h"
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "url-push-button.hpp"
#ifdef BROWSER_AVAILABLE

2
UI/window-basic-settings.cpp
View file

@ -35,6 +35,7 @@
#include <QScreen>
#include <QStandardItemModel>
#include <QSpacerItem>
#include <qt-wrappers.hpp>
#include "audio-encoders.hpp"
#include "hotkey-edit.hpp"
@ -42,7 +43,6 @@
#include "obs-app.hpp"
#include "platform.hpp"
#include "properties-view.hpp"
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include "window-basic-settings.hpp"
#include "window-basic-main-outputs.hpp"

2
UI/window-basic-source-select.cpp
View file

@ -16,9 +16,9 @@
******************************************************************************/
#include <QMessageBox>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "window-basic-source-select.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
struct AddSourceData {

2
UI/window-basic-stats.cpp
View file

@ -4,8 +4,8 @@
#include "window-basic-main.hpp"
#include "platform.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QPushButton>
#include <QScrollArea>
#include <QVBoxLayout>

2
UI/window-basic-vcam-config.cpp
View file

@ -1,7 +1,7 @@
#include "window-basic-vcam-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <util/util.hpp>
#include <util/platform.h>

2
UI/window-extra-browsers.cpp
View file

@ -1,8 +1,8 @@
#include "window-extra-browsers.hpp"
#include "window-dock-browser.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QLineEdit>
#include <QHBoxLayout>
#include <QUuid>

2
UI/window-importer.cpp
View file

@ -26,8 +26,8 @@
#include <QStyledItemDelegate>
#include <QDirIterator>
#include <QDropEvent>
#include <qt-wrappers.hpp>
#include "qt-wrappers.hpp"
#include "importers/importers.hpp"
extern bool SceneCollectionExists(const char *findName);

2
UI/window-missing-files.cpp
View file

@ -24,7 +24,7 @@
#include <QToolButton>
#include <QFileDialog>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
enum MissingFilesColumn {
Source,

2
UI/window-namedialog.cpp
View file

@ -16,9 +16,9 @@
******************************************************************************/
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QVBoxLayout>
NameDialog::NameDialog(QWidget *parent) : QDialog(parent)

2
UI/window-projector.cpp
View file

@ -3,10 +3,10 @@
#include <QMouseEvent>
#include <QMenu>
#include <QScreen>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "display-helpers.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include "multiview.hpp"

2
UI/window-remux.cpp
View file

@ -31,8 +31,8 @@
#include <QStyledItemDelegate>
#include <QToolButton>
#include <QTimer>
#include <qt-wrappers.hpp>
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include <memory>

2
UI/window-youtube-actions.cpp
View file

@ -2,9 +2,9 @@
#include "window-youtube-actions.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "youtube-api-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QToolTip>
#include <QDateTime>
#include <QDesktopServices>

2
UI/youtube-api-wrappers.cpp
View file

@ -6,11 +6,11 @@
#include <string>
#include <iostream>
#include <qt-wrappers.hpp>
#include "auth-youtube.hpp"
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
#include "ui-config.h"
#include "obf.h"

4
build-aux/.run-format.zsh
View file

@ -54,7 +54,7 @@ invoke_formatter() {
exit 2
fi
if (( ! #source_files )) source_files=((libobs|libobs-*|UI|plugins|deps)/**/*.(c|cpp|h|hpp|m|mm)(.N))
if (( ! #source_files )) source_files=((libobs|libobs-*|UI|plugins|deps|shared)/**/*.(c|cpp|h|hpp|m|mm)(.N))
source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
@ -75,7 +75,7 @@ invoke_formatter() {
exit 2
}
if (( ! #source_files )) source_files=((libobs|libobs-*|UI|plugins|deps|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
if (( ! #source_files )) source_files=((libobs|libobs-*|UI|plugins|deps|shared|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})

6
deps/CMakeLists.txt vendored
View file

@ -1,13 +1,7 @@
if(OS_WINDOWS)
add_subdirectory(ipc-util)
add_subdirectory(w32-pthreads)
endif()
add_subdirectory(blake2)
add_subdirectory(file-updater)
add_subdirectory(glad)
add_subdirectory(happy-eyeballs)
add_subdirectory(libcaption)
add_subdirectory(media-playback)
add_subdirectory(obs-scripting)
add_subdirectory(opts-parser)

4
plugins/obs-ffmpeg/cmake/dependencies.cmake
View file

@ -17,11 +17,11 @@ find_package(
# cmake-format: on
if(NOT TARGET OBS::media-playback)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/media-playback" "${CMAKE_BINARY_DIR}/deps/media-playback")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback")
endif()
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/opts-parser" "${CMAKE_BINARY_DIR}/deps/opts-parser")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
if(OS_WINDOWS)

8
plugins/obs-ffmpeg/cmake/legacy.cmake
View file

@ -17,6 +17,14 @@ find_package(
add_library(obs-ffmpeg MODULE)
add_library(OBS::ffmpeg ALIAS obs-ffmpeg)
if(NOT TARGET OBS::media-playback)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback")
endif()
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
add_subdirectory(ffmpeg-mux)
if(ENABLE_NEW_MPEGTS_OUTPUT)
find_package(Librist QUIET)

6
plugins/obs-outputs/CMakeLists.txt
View file

@ -6,7 +6,11 @@ find_package(MbedTLS REQUIRED)
find_package(ZLIB REQUIRED)
if(NOT TARGET happy-eyeballs)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/happy-eyeballs" "${CMAKE_BINARY_DIR}/deps/happy-eyeballs")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
endif()
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
add_library(obs-outputs MODULE)

8
plugins/obs-outputs/cmake/legacy.cmake
View file

@ -13,6 +13,14 @@ mark_as_advanced(ENABLE_STATIC_MBEDTLS)
add_library(obs-outputs MODULE)
add_library(OBS::outputs ALIAS obs-outputs)
if(NOT TARGET happy-eyeballs)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
endif()
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
target_sources(
obs-outputs
PRIVATE obs-outputs.c

2
plugins/obs-x264/CMakeLists.txt
View file

@ -5,7 +5,7 @@ legacy_check()
find_package(Libx264 REQUIRED)
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/opts-parser" "${CMAKE_BINARY_DIR}/deps/opts-parser")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
add_library(obs-x264 MODULE)

4
plugins/obs-x264/cmake/legacy.cmake
View file

@ -6,6 +6,10 @@ add_library(obs-x264 MODULE)
add_library(OBS::x264 ALIAS obs-x264)
add_executable(obs-x264-test)
if(NOT TARGET OBS::opts-parser)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
endif()
target_sources(obs-x264-test PRIVATE obs-x264-test.c)
target_link_libraries(obs-x264-test PRIVATE OBS::opts-parser)

2
plugins/rtmp-services/CMakeLists.txt
View file

@ -10,7 +10,7 @@ set(RTMP_SERVICES_URL
mark_as_advanced(RTMP_SERVICES_URL)
if(NOT TARGET OBS::file-updater)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/file-updater" "${CMAKE_BINARY_DIR}/deps/file-updater")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
endif()
find_package(jansson REQUIRED)

4
plugins/rtmp-services/cmake/legacy.cmake
View file

@ -13,6 +13,10 @@ add_library(OBS::rtmp-services ALIAS rtmp-services)
find_package(Jansson 2.5 REQUIRED)
if(NOT TARGET OBS::file-updater)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
endif()
target_sources(
rtmp-services
PRIVATE service-specific/twitch.c

4
plugins/win-capture/CMakeLists.txt
View file

@ -27,11 +27,11 @@ mark_as_advanced(COMPAT_URL)
# cmake-format: on
if(NOT TARGET OBS::ipc-util)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
endif()
if(NOT TARGET OBS::file-updater)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/file-updater" "${CMAKE_BINARY_DIR}/deps/file-updater")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
endif()
find_package(jansson REQUIRED)

8
plugins/win-capture/cmake/legacy.cmake
View file

@ -13,6 +13,14 @@ add_library(OBS::capture ALIAS win-capture)
find_package(Jansson 2.5 REQUIRED)
if(NOT TARGET OBS::ipc-util)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
endif()
if(NOT TARGET OBS::file-updater)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compat-config.h.in ${CMAKE_BINARY_DIR}/config/compat-config.h)
target_sources(

2
plugins/win-capture/graphics-hook/CMakeLists.txt
View file

@ -4,7 +4,7 @@ find_package(Detours REQUIRED)
find_package(Vulkan REQUIRED)
if(NOT TARGET OBS::ipc-util)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
endif()
if(NOT TARGET OBS::obfuscate)

4
plugins/win-capture/graphics-hook/cmake/legacy.cmake
View file

@ -6,6 +6,10 @@ find_package(Vulkan REQUIRED)
add_library(graphics-hook MODULE)
add_library(OBS::graphics-hook ALIAS graphics-hook)
if(NOT TARGET OBS::ipc-util)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
endif()
target_sources(
graphics-hook
PRIVATE graphics-hook.c

0
deps/file-updater/CMakeLists.txt → shared/file-updater/CMakeLists.txt
View file

0
deps/file-updater/file-updater/file-updater.c → shared/file-updater/file-updater/file-updater.c
View file

0
deps/file-updater/file-updater/file-updater.h → shared/file-updater/file-updater/file-updater.h
View file

0
deps/happy-eyeballs/CMakeLists.txt → shared/happy-eyeballs/CMakeLists.txt
View file

0
deps/happy-eyeballs/happy-eyeballs.c → shared/happy-eyeballs/happy-eyeballs.c
View file

0
deps/happy-eyeballs/happy-eyeballs.h → shared/happy-eyeballs/happy-eyeballs.h
View file

0
deps/ipc-util/CMakeLists.txt → shared/ipc-util/CMakeLists.txt
View file

0
deps/ipc-util/ipc-util/pipe-posix.c → shared/ipc-util/ipc-util/pipe-posix.c
View file

0
deps/ipc-util/ipc-util/pipe-posix.h → shared/ipc-util/ipc-util/pipe-posix.h
View file

0
deps/ipc-util/ipc-util/pipe-windows.c → shared/ipc-util/ipc-util/pipe-windows.c
View file

0
deps/ipc-util/ipc-util/pipe-windows.h → shared/ipc-util/ipc-util/pipe-windows.h
View file

0
deps/ipc-util/ipc-util/pipe.h → shared/ipc-util/ipc-util/pipe.h
View file

0
deps/media-playback/CMakeLists.txt → shared/media-playback/CMakeLists.txt
View file

0
deps/media-playback/LICENSE.media-playback → shared/media-playback/LICENSE.media-playback
View file

0
deps/media-playback/media-playback/cache.c → shared/media-playback/media-playback/cache.c
View file

0
deps/media-playback/media-playback/cache.h → shared/media-playback/media-playback/cache.h
View file

0
deps/media-playback/media-playback/closest-format.h → shared/media-playback/media-playback/closest-format.h
View file

0
deps/media-playback/media-playback/decode.c → shared/media-playback/media-playback/decode.c
View file

0
deps/media-playback/media-playback/decode.h → shared/media-playback/media-playback/decode.h
View file

0
deps/media-playback/media-playback/media-playback.c → shared/media-playback/media-playback/media-playback.c
View file

0
deps/media-playback/media-playback/media-playback.h → shared/media-playback/media-playback/media-playback.h
View file

0
deps/media-playback/media-playback/media.c → shared/media-playback/media-playback/media.c
View file

0
deps/media-playback/media-playback/media.h → shared/media-playback/media-playback/media.h
View file

0
deps/obs-scripting/CMakeLists.txt → shared/obs-scripting/CMakeLists.txt
View file

Some files were not shown because too many files have changed in this diff Show more