Skip to content

Commit 4261f1f

Browse files
committed
UI: Enable browser hw accel toggle under Linux
1 parent 45a89ab commit 4261f1f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

frontend/OBSApp.cpp

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

231231
#ifdef _WIN32
232232
config_set_default_bool(appConfig, "Audio", "DisableAudioDucking", true);
233+
#endif
234+
235+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
233236
config_set_default_bool(appConfig, "General", "BrowserHWAccel", true);
234237
#endif
235238

236239
#ifdef __APPLE__
237-
config_set_default_bool(appConfig, "General", "BrowserHWAccel", true);
238240
config_set_default_bool(appConfig, "Video", "DisableOSXVSync", true);
239241
config_set_default_bool(appConfig, "Video", "ResetOSXVSyncOnExit", true);
240242
#endif
@@ -1053,7 +1055,7 @@ bool OBSApp::OBSInit()
10531055

10541056
obs_set_ui_task_handler(ui_task_handler);
10551057

1056-
#if defined(_WIN32) || defined(__APPLE__)
1058+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
10571059
bool browserHWAccel = config_get_bool(appConfig, "General", "BrowserHWAccel");
10581060

10591061
OBSDataAutoRelease settings = obs_data_create();

frontend/settings/OBSBasicSettings.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
523523
#ifdef _WIN32
524524
HookWidget(ui->disableAudioDucking, CHECK_CHANGED, ADV_CHANGED);
525525
#endif
526-
#if defined(_WIN32) || defined(__APPLE__)
526+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
527527
HookWidget(ui->browserHWAccel, CHECK_CHANGED, ADV_RESTART);
528528
#endif
529529
HookWidget(ui->filenameFormatting, EDIT_CHANGED, ADV_CHANGED);
@@ -611,7 +611,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
611611
delete ui->enableNewSocketLoop;
612612
delete ui->enableLowLatencyMode;
613613
delete ui->hideOBSFromCapture;
614-
#ifdef __linux__
614+
#if !defined(__APPLE__) && !defined(__linux__)
615615
delete ui->browserHWAccel;
616616
delete ui->sourcesGroup;
617617
#endif
@@ -626,7 +626,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
626626
ui->enableNewSocketLoop = nullptr;
627627
ui->enableLowLatencyMode = nullptr;
628628
ui->hideOBSFromCapture = nullptr;
629-
#ifdef __linux__
629+
#if !defined(__APPLE__) && !defined(__linux__)
630630
ui->browserHWAccel = nullptr;
631631
ui->sourcesGroup = nullptr;
632632
#endif
@@ -2586,7 +2586,7 @@ void OBSBasicSettings::LoadAdvancedSettings()
25862586
ui->enableLowLatencyMode->setChecked(enableLowLatencyMode);
25872587
ui->enableLowLatencyMode->setToolTip(QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip"));
25882588
#endif
2589-
#if defined(_WIN32) || defined(__APPLE__)
2589+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
25902590
bool browserHWAccel = config_get_bool(App()->GetAppConfig(), "General", "BrowserHWAccel");
25912591
ui->browserHWAccel->setChecked(browserHWAccel);
25922592
prevBrowserAccel = ui->browserHWAccel->isChecked();
@@ -3133,7 +3133,7 @@ void OBSBasicSettings::SaveAdvancedSettings()
31333133
SaveCheckBox(ui->enableNewSocketLoop, "Output", "NewSocketLoopEnable");
31343134
SaveCheckBox(ui->enableLowLatencyMode, "Output", "LowLatencyEnable");
31353135
#endif
3136-
#if defined(_WIN32) || defined(__APPLE__)
3136+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
31373137
bool browserHWAccel = ui->browserHWAccel->isChecked();
31383138
config_set_bool(App()->GetAppConfig(), "General", "BrowserHWAccel", browserHWAccel);
31393139
#endif

0 commit comments

Comments
 (0)