Skip to content

Commit bdebea3

Browse files
tytan652RytoEX
authored andcommitted
frontend: Enable browser hw accel toggle under Linux
1 parent e8d1834 commit bdebea3

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

frontend/OBSApp.cpp

Lines changed: 4 additions & 2 deletions
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
@@ -1091,7 +1093,7 @@ bool OBSApp::OBSInit()
10911093

10921094
obs_set_ui_task_handler(ui_task_handler);
10931095

1094-
#if defined(_WIN32) || defined(__APPLE__)
1096+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
10951097
bool browserHWAccel = config_get_bool(appConfig, "General", "BrowserHWAccel");
10961098

10971099
OBSDataAutoRelease settings = obs_data_create();

frontend/settings/OBSBasicSettings.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
530530
#ifdef _WIN32
531531
HookWidget(ui->disableAudioDucking, CHECK_CHANGED, ADV_CHANGED);
532532
#endif
533-
#if defined(_WIN32) || defined(__APPLE__)
533+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
534534
HookWidget(ui->browserHWAccel, CHECK_CHANGED, ADV_RESTART);
535535
#endif
536536
HookWidget(ui->filenameFormatting, EDIT_CHANGED, ADV_CHANGED);
@@ -618,7 +618,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
618618
delete ui->enableNewSocketLoop;
619619
delete ui->enableLowLatencyMode;
620620
delete ui->hideOBSFromCapture;
621-
#ifdef __linux__
621+
#if !defined(__APPLE__) && !defined(__linux__)
622622
delete ui->browserHWAccel;
623623
delete ui->sourcesGroup;
624624
#endif
@@ -633,7 +633,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
633633
ui->enableNewSocketLoop = nullptr;
634634
ui->enableLowLatencyMode = nullptr;
635635
ui->hideOBSFromCapture = nullptr;
636-
#ifdef __linux__
636+
#if !defined(__APPLE__) && !defined(__linux__)
637637
ui->browserHWAccel = nullptr;
638638
ui->sourcesGroup = nullptr;
639639
#endif
@@ -2593,7 +2593,7 @@ void OBSBasicSettings::LoadAdvancedSettings()
25932593
ui->enableLowLatencyMode->setChecked(enableLowLatencyMode);
25942594
ui->enableLowLatencyMode->setToolTip(QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip"));
25952595
#endif
2596-
#if defined(_WIN32) || defined(__APPLE__)
2596+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
25972597
bool browserHWAccel = config_get_bool(App()->GetAppConfig(), "General", "BrowserHWAccel");
25982598
ui->browserHWAccel->setChecked(browserHWAccel);
25992599
prevBrowserAccel = ui->browserHWAccel->isChecked();
@@ -3140,7 +3140,7 @@ void OBSBasicSettings::SaveAdvancedSettings()
31403140
SaveCheckBox(ui->enableNewSocketLoop, "Output", "NewSocketLoopEnable");
31413141
SaveCheckBox(ui->enableLowLatencyMode, "Output", "LowLatencyEnable");
31423142
#endif
3143-
#if defined(_WIN32) || defined(__APPLE__)
3143+
#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
31443144
bool browserHWAccel = ui->browserHWAccel->isChecked();
31453145
config_set_bool(App()->GetAppConfig(), "General", "BrowserHWAccel", browserHWAccel);
31463146
#endif

0 commit comments

Comments
 (0)