From 0b119ba1e84d56766bca2054610d47f52bb0d239 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 21 Sep 2015 19:31:08 -0700 Subject: [PATCH] UI: Remove 22.05khz 22.05khz audio really doesn't make sense to have available, and causes issues with encoders (primarily CoreAudio) --- obs/forms/OBSBasicSettings.ui | 7 +------ obs/window-basic-settings.cpp | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/obs/forms/OBSBasicSettings.ui b/obs/forms/OBSBasicSettings.ui index a41afd5b9..09ee8a1d4 100644 --- a/obs/forms/OBSBasicSettings.ui +++ b/obs/forms/OBSBasicSettings.ui @@ -2082,13 +2082,8 @@ 44.1khz - 1 + 0 - - - 22.05khz - - 44.1khz diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index 45fd16965..e63e09096 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -1541,9 +1541,7 @@ void OBSBasicSettings::LoadAudioSettings() loading = true; const char *str; - if (sampleRate == 22050) - str = "22.05khz"; - else if (sampleRate == 48000) + if (sampleRate == 48000) str = "48khz"; else str = "44.1khz"; @@ -2175,9 +2173,7 @@ void OBSBasicSettings::SaveAudioSettings() const char *channelSetup = (channelSetupIdx == 0) ? "Mono" : "Stereo"; int sampleRate = 44100; - if (sampleRateStr == "22.05khz") - sampleRate = 22050; - else if (sampleRateStr == "48khz") + if (sampleRateStr == "48khz") sampleRate = 48000; if (WidgetChanged(ui->sampleRate))