Merge branch 'defaultdevice' into 'master'

Fix default audio device switch for PulseAudio backend (#7731) Closes #7731 See merge request OpenMW/openmw!4505
OpenMW · Jan 10, 2025 · 763e888 · 763e888
2 parents 4c92064 + dd44b26
commit 763e888
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
@@ -417,19 +417,15 @@ namespace MWSound
             {
                 {
                     const std::lock_guard<std::mutex> openLock(mOutput.mReopenMutex);
-                    auto defaultName = getDeviceName(nullptr);
+                    std::basic_string_view<ALCchar> defaultName = getDeviceName(nullptr);
                     if (mCurrentName != defaultName)
                     {
-                        Log(Debug::Info) << "Default audio device changed";
-                        ALCboolean reopened
-                            = alcReopenDeviceSOFT(mOutput.mDevice, nullptr, mOutput.mContextAttributes.data());
+                        mCurrentName = defaultName;
+                        Log(Debug::Info) << "Default audio device changed to \"" << mCurrentName << "\"";
+                        ALCboolean reopened = alcReopenDeviceSOFT(
+                            mOutput.mDevice, mCurrentName.data(), mOutput.mContextAttributes.data());
                         if (reopened == AL_FALSE)
-                        {
-                            mCurrentName = defaultName;
                             Log(Debug::Warning) << "Failed to switch to new audio device";
-                        }
-                        else
-                            mCurrentName = getDeviceName(mOutput.mDevice);
                     }
                 }
                 mCondVar.wait_for(lock, std::chrono::seconds(2));