diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index afe2e2e0a..8e421a27a 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -483,6 +483,8 @@ bool OBSApp::InitGlobalConfigDefaults() #endif #ifdef __APPLE__ + config_set_default_bool(globalConfig, "General", "BrowserHWAccel", + true); config_set_default_bool(globalConfig, "Video", "DisableOSXVSync", true); config_set_default_bool(globalConfig, "Video", "ResetOSXVSyncOnExit", true); @@ -1387,7 +1389,7 @@ bool OBSApp::OBSInit() obs_set_ui_task_handler(ui_task_handler); -#ifdef _WIN32 +#if defined(_WIN32) || defined(__APPLE__) bool browserHWAccel = config_get_bool(globalConfig, "General", "BrowserHWAccel"); diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 6bfaa328d..d0ee1a1d6 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -538,6 +538,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) #endif #ifdef _WIN32 HookWidget(ui->disableAudioDucking, CHECK_CHANGED, ADV_CHANGED); +#endif +#if defined(_WIN32) || defined(__APPLE__) HookWidget(ui->browserHWAccel, CHECK_CHANGED, ADV_RESTART); #endif HookWidget(ui->filenameFormatting, EDIT_CHANGED, ADV_CHANGED); @@ -627,8 +629,10 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) delete ui->advancedGeneralGroupBox; delete ui->enableNewSocketLoop; delete ui->enableLowLatencyMode; +#ifdef __linux__ delete ui->browserHWAccel; delete ui->sourcesGroup; +#endif #if defined(__APPLE__) || HAVE_PULSEAUDIO delete ui->disableAudioDucking; #endif @@ -641,8 +645,10 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) ui->advancedGeneralGroupBox = nullptr; ui->enableNewSocketLoop = nullptr; ui->enableLowLatencyMode = nullptr; +#ifdef __linux__ ui->browserHWAccel = nullptr; ui->sourcesGroup = nullptr; +#endif #if defined(__APPLE__) || HAVE_PULSEAUDIO ui->disableAudioDucking = nullptr; #endif @@ -2554,7 +2560,8 @@ void OBSBasicSettings::LoadAdvancedSettings() ui->enableLowLatencyMode->setChecked(enableLowLatencyMode); ui->enableLowLatencyMode->setToolTip( QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip")); - +#endif +#if defined(_WIN32) || defined(__APPLE__) bool browserHWAccel = config_get_bool(App()->GlobalConfig(), "General", "BrowserHWAccel"); ui->browserHWAccel->setChecked(browserHWAccel); @@ -3175,7 +3182,8 @@ void OBSBasicSettings::SaveAdvancedSettings() SaveCheckBox(ui->enableNewSocketLoop, "Output", "NewSocketLoopEnable"); SaveCheckBox(ui->enableLowLatencyMode, "Output", "LowLatencyEnable"); - +#endif +#if defined(_WIN32) || defined(__APPLE__) bool browserHWAccel = ui->browserHWAccel->isChecked(); config_set_bool(App()->GlobalConfig(), "General", "BrowserHWAccel", browserHWAccel);