From 60a7d3d6e0af503f81e3e5ec9b1b0c007f2cf000 Mon Sep 17 00:00:00 2001
From: Lennart Bernhardt <me@lenny.ninja>
Date: Sun, 6 Aug 2017 20:10:56 +0200
Subject: [PATCH 1/3] Fade out music before change occurs

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 40 +++++++++++++++++++++++--
 apps/openmw/mwsound/soundmanagerimp.hpp |  6 ++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 53c0643f6..97030643f 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -34,7 +34,7 @@
 
 namespace MWSound
 {
-    SoundManager::SoundManager(const VFS::Manager* vfs, const std::map<std::string,std::string>& fallbackMap, bool useSound)
+    SoundManager::SoundManager(const VFS::Manager* vfs, const std::map<std::string, std::string>& fallbackMap, bool useSound)
         : mVFS(vfs)
         , mFallback(fallbackMap)
         , mOutput(new DEFAULT_OUTPUT(*this))
@@ -328,9 +328,23 @@ namespace MWSound
         }
     }
 
+    void SoundManager::advanceMusic(const std::string& filename)
+    {
+        if (!isMusicPlaying())
+        {
+            streamMusicFull(filename);
+            return;
+        }
+
+        mMusicFader = 0.5f;
+        mNextMusic = filename;
+
+        mMusic->setFadeout(mMusicFader);
+    }
+
     void SoundManager::streamMusic(const std::string& filename)
     {
-        streamMusicFull("Music/"+filename);
+        advanceMusic("Music/"+filename);
     }
 
     void SoundManager::startRandomTitle()
@@ -370,7 +384,7 @@ namespace MWSound
             i = (i+1) % filelist.size();
         }
 
-        streamMusicFull(filelist[i]);
+        advanceMusic(filelist[i]);
     }
 
     bool SoundManager::isMusicPlaying()
@@ -1029,6 +1043,25 @@ namespace MWSound
     }
 
 
+    void SoundManager::updateMusic(float duration)
+    {
+        if (!mNextMusic.empty())
+        {
+            mMusic->updateFade(duration);
+
+            mOutput->startUpdate();
+            mOutput->updateStream(mMusic);
+            mOutput->finishUpdate();
+            
+            if (mMusic->getRealVolume() <= 0.f)
+            {
+                streamMusicFull(mNextMusic);
+                mNextMusic.clear();
+            }
+        }
+    }
+
+
     void SoundManager::update(float duration)
     {
         if(!mOutput->isInitialized())
@@ -1040,6 +1073,7 @@ namespace MWSound
             updateSounds(duration);
             updateRegionSound(duration);
             updateWaterSound(duration);
+            updateMusic(duration);
         }
     }
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index bf628b102..1c5348e65 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -114,9 +114,15 @@ namespace MWSound
         MWBase::SoundStreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f &pos, bool playlocal);
 
         void streamMusicFull(const std::string& filename);
+        void advanceMusic(const std::string& filename);
+
         void updateSounds(float duration);
         void updateRegionSound(float duration);
         void updateWaterSound(float duration);
+        void updateMusic(float duration);
+
+        float mMusicFader;
+        std::string mNextMusic;
 
         float volumeFromType(PlayType type) const;
 

From 7b8278ae45941226a555a5c9dd4840d9fc57eca1 Mon Sep 17 00:00:00 2001
From: Lennart Bernhardt <me@lenny.ninja>
Date: Tue, 8 Aug 2017 03:17:40 +0200
Subject: [PATCH 2/3] remove redundant mMusicFader variable

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 3 +--
 apps/openmw/mwsound/soundmanagerimp.hpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 97030643f..88ee42b01 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -336,10 +336,9 @@ namespace MWSound
             return;
         }
 
-        mMusicFader = 0.5f;
         mNextMusic = filename;
 
-        mMusic->setFadeout(mMusicFader);
+        mMusic->setFadeout(0.5f);
     }
 
     void SoundManager::streamMusic(const std::string& filename)
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 1c5348e65..5d911d4be 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -121,7 +121,6 @@ namespace MWSound
         void updateWaterSound(float duration);
         void updateMusic(float duration);
 
-        float mMusicFader;
         std::string mNextMusic;
 
         float volumeFromType(PlayType type) const;

From 546352dbe311a11cbd1e2da9335ef38b9197d59f Mon Sep 17 00:00:00 2001
From: Lennart Bernhardt <me@lenny.ninja>
Date: Tue, 8 Aug 2017 03:31:01 +0200
Subject: [PATCH 3/3] avoid starting sound updates more than necessary

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 88ee42b01..c6f663059 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -938,6 +938,8 @@ namespace MWSound
             env
         );
 
+        updateMusic(duration);
+
         // Check if any sounds are finished playing, and trash them
         SoundMap::iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
@@ -1048,9 +1050,7 @@ namespace MWSound
         {
             mMusic->updateFade(duration);
 
-            mOutput->startUpdate();
             mOutput->updateStream(mMusic);
-            mOutput->finishUpdate();
             
             if (mMusic->getRealVolume() <= 0.f)
             {
@@ -1072,7 +1072,6 @@ namespace MWSound
             updateSounds(duration);
             updateRegionSound(duration);
             updateWaterSound(duration);
-            updateMusic(duration);
         }
     }