opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-30 17:58:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI/importers: Translate capture sources depending on WS

Browse Source 
Translate window or game capture sources to xcomposite or pipewire
depending on the window system used.
This change prevents xcomposite being assigned on non-X11 systems
which causes a crash
This commit is contained in:
SarenDev
2024-10-27 00:06:34 +02:00
committed by Ryan Foster
parent ab48cd0b3d
commit 23e772cc2c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/importers/studio.cpp
+10 -1
View File
@@ -16,6 +16,9 @@
******************************************************************************/
#include "importers.hpp"
#if !defined(_WIN32) && !defined(__APPLE__)
#include <obs-nix-platform.h>
#endif
using namespace std;
using namespace json11;
@@ -109,7 +112,13 @@ void TranslateOSStudio(Json &res)
ClearTranslation("av_capture_input", "v4l2_input");
ClearTranslation("dshow_input", "v4l2_input");
ClearTranslation("window_capture", "xcomposite_input");
if (obs_get_nix_platform() == OBS_NIX_PLATFORM_X11_EGL) {
ClearTranslation("game_capture", "xcomposite_input");
ClearTranslation("window_capture", "xcomposite_input");
} else {
ClearTranslation("game_capture", "pipewire-screen-capture-source");
ClearTranslation("window_capture", "pipewire-screen-capture-source");
}
if (id == "monitor_capture") {
source["id"] = "xshm_input";