From 088bd6aacc94c0ce93ff3b1536741fb6803eeebd Mon Sep 17 00:00:00 2001 From: aware70 <7832566+aware70@users.noreply.github.com> Date: Tue, 4 Jun 2024 21:01:23 -0500 Subject: [PATCH 1/2] Fix warning about missing default codecs on first run, when those codecs do exist --- scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp b/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp index 2830ed3e..8617ed03 100644 --- a/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp +++ b/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp @@ -167,7 +167,7 @@ bool AudioCodecPage::IsRequired() // Setup is required if codec errors are not ignored, and the default codecs // are not supported return (!ignoreCodecErrors && - oggCodecs.contains(QMediaFormat::AudioCodec::Vorbis)); + !oggCodecs.contains(QMediaFormat::AudioCodec::Vorbis)); } } // namespace setup From 8536bc5c6286aa7ff38c74a8052b80dcef25acd5 Mon Sep 17 00:00:00 2001 From: aware70 <7832566+aware70@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:02:29 -0500 Subject: [PATCH 2/2] Check for any Ogg support in audio setup, not just Vorbis --- scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp b/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp index 8617ed03..dd86e1f6 100644 --- a/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp +++ b/scwx-qt/source/scwx/qt/ui/setup/audio_codec_page.cpp @@ -164,10 +164,9 @@ bool AudioCodecPage::IsRequired() auto oggCodecs = oggFormat.supportedAudioCodecs(QMediaFormat::ConversionMode::Decode); - // Setup is required if codec errors are not ignored, and the default codecs - // are not supported - return (!ignoreCodecErrors && - !oggCodecs.contains(QMediaFormat::AudioCodec::Vorbis)); + // Setup is required if codec errors are not ignored, and no Ogg support + // is found. + return (!ignoreCodecErrors && oggCodecs.empty()); } } // namespace setup