mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Fade out music before change occurs

Browse Source
This commit is contained in:
Lennart Bernhardt 2017-08-06 20:10:56 +02:00
parent fe8437ae10
commit 60a7d3d6e0
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/openmw/mwsound/soundmanagerimp.cpp
View File

@ -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);
}
}

6
apps/openmw/mwsound/soundmanagerimp.hpp
View File

@ -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;