Skip to content

Commit 2baf1e7

Browse files
committed
UI: Enable browser hw accel toggle under Linux
1 parent e6d9f73 commit 2baf1e7

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

UI/obs-app.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,13 @@ bool OBSApp::InitGlobalConfigDefaults()
440440

441441
#ifdef _WIN32
442442
config_set_default_bool(appConfig, "Audio", "DisableAudioDucking", true);
443+
#endif
444+
445+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
443446
config_set_default_bool(appConfig, "General", "BrowserHWAccel", true);
444447
#endif
445448

446449
#ifdef __APPLE__
447-
config_set_default_bool(appConfig, "General", "BrowserHWAccel", true);
448450
config_set_default_bool(appConfig, "Video", "DisableOSXVSync", true);
449451
config_set_default_bool(appConfig, "Video", "ResetOSXVSyncOnExit", true);
450452
#endif
@@ -1292,7 +1294,7 @@ bool OBSApp::OBSInit()
12921294

12931295
obs_set_ui_task_handler(ui_task_handler);
12941296

1295-
#if defined(_WIN32) || defined(__APPLE__)
1297+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
12961298
bool browserHWAccel = config_get_bool(userConfig, "General", "BrowserHWAccel");
12971299

12981300
OBSDataAutoRelease settings = obs_data_create();

UI/window-basic-settings.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
551551
#ifdef _WIN32
552552
HookWidget(ui->disableAudioDucking, CHECK_CHANGED, ADV_CHANGED);
553553
#endif
554-
#if defined(_WIN32) || defined(__APPLE__)
554+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
555555
HookWidget(ui->browserHWAccel, CHECK_CHANGED, ADV_RESTART);
556556
#endif
557557
HookWidget(ui->filenameFormatting, EDIT_CHANGED, ADV_CHANGED);
@@ -639,7 +639,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
639639
delete ui->enableNewSocketLoop;
640640
delete ui->enableLowLatencyMode;
641641
delete ui->hideOBSFromCapture;
642-
#ifdef __linux__
642+
#if !defined(__APPLE__) && !defined(__linux__)
643643
delete ui->browserHWAccel;
644644
delete ui->sourcesGroup;
645645
#endif
@@ -654,7 +654,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
654654
ui->enableNewSocketLoop = nullptr;
655655
ui->enableLowLatencyMode = nullptr;
656656
ui->hideOBSFromCapture = nullptr;
657-
#ifdef __linux__
657+
#if !defined(__APPLE__) && !defined(__linux__)
658658
ui->browserHWAccel = nullptr;
659659
ui->sourcesGroup = nullptr;
660660
#endif
@@ -2614,7 +2614,7 @@ void OBSBasicSettings::LoadAdvancedSettings()
26142614
ui->enableLowLatencyMode->setChecked(enableLowLatencyMode);
26152615
ui->enableLowLatencyMode->setToolTip(QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip"));
26162616
#endif
2617-
#if defined(_WIN32) || defined(__APPLE__)
2617+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
26182618
bool browserHWAccel = config_get_bool(App()->GetUserConfig(), "General", "BrowserHWAccel");
26192619
ui->browserHWAccel->setChecked(browserHWAccel);
26202620
prevBrowserAccel = ui->browserHWAccel->isChecked();
@@ -3161,7 +3161,7 @@ void OBSBasicSettings::SaveAdvancedSettings()
31613161
SaveCheckBox(ui->enableNewSocketLoop, "Output", "NewSocketLoopEnable");
31623162
SaveCheckBox(ui->enableLowLatencyMode, "Output", "LowLatencyEnable");
31633163
#endif
3164-
#if defined(_WIN32) || defined(__APPLE__)
3164+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
31653165
bool browserHWAccel = ui->browserHWAccel->isChecked();
31663166
config_set_bool(App()->GetUserConfig(), "General", "BrowserHWAccel", browserHWAccel);
31673167
#endif

0 commit comments

Comments
 (0)