From 7527ef2526458ba0dd638acebdeca2b7525944c8 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Mon, 23 Dec 2024 13:20:43 +0100 Subject: [PATCH] refactor: Remove unused function --- src/misc/audio/audioutils.cpp | 11 ----------- src/misc/audio/audioutils.h | 4 ---- src/swiftcore/main.cpp | 1 - src/swiftguistandard/main.cpp | 1 - 4 files changed, 17 deletions(-) diff --git a/src/misc/audio/audioutils.cpp b/src/misc/audio/audioutils.cpp index 2310addf7..68ea54910 100644 --- a/src/misc/audio/audioutils.cpp +++ b/src/misc/audio/audioutils.cpp @@ -19,15 +19,4 @@ namespace swift::misc::audio return QProcess::startDetached("SndVol.exe"); } - void initWindowsAudioDevices() - { - if (!CBuildConfig::isRunningOnWindowsNtPlatform()) { return; } - - // force init of device lists - // see https://discordapp.com/channels/539048679160676382/539925070550794240/676418182038421534 - // TODO Is this still required with Qt 6? - QMediaDevices::audioInputs(); - QMediaDevices::audioOutputs(); - } - } // namespace swift::misc::audio diff --git a/src/misc/audio/audioutils.h b/src/misc/audio/audioutils.h index a6d21b79c..1d54b1089 100644 --- a/src/misc/audio/audioutils.h +++ b/src/misc/audio/audioutils.h @@ -12,10 +12,6 @@ namespace swift::misc::audio { //! Start the Windows mixer SWIFT_MISC_EXPORT bool startWindowsMixer(); - - //! On windows init the audio devices - //! \remarks workaround for WASAPI driver crashes, hoping that upfront init already sets global vars. etc. - SWIFT_MISC_EXPORT void initWindowsAudioDevices(); } // namespace swift::misc::audio #endif // SWIFT_MISC_AUDIO_UTILS_H diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp index f5b931551..1c879108c 100644 --- a/src/swiftcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -24,7 +24,6 @@ int main(int argc, char *argv[]) QApplication qa(argc, argv); Q_UNUSED(qa) // init of qa is required, but qa not used - // initWindowsAudioDevices(); CCrashHandler::instance()->init(); CGuiApplication a(CApplicationInfo::swiftCore(), CApplicationInfo::PilotClientCore, CIcons::swiftCore24()); a.addWindowStateOption(); diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp index 466892b3c..b825c93b4 100644 --- a/src/swiftguistandard/main.cpp +++ b/src/swiftguistandard/main.cpp @@ -25,7 +25,6 @@ int main(int argc, char *argv[]) QApplication qa(argc, argv); Q_UNUSED(qa) // application init needed - // initWindowsAudioDevices(); CCrashHandler::instance()->init(); // at shutdown the whole application will be "deleted" outside the block