mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 12:09:41 +00:00
Code Issues Releases Wiki Activity

Corrected setPlaylist and added stopMusic

Browse source
This commit is contained in:
Michael Papageorgiou 2012-03-09 03:56:29 +02:00
parent 44620ada86
commit a309ef7b55
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwsound/soundmanager.cpp
View file

@ -266,6 +266,13 @@ namespace MWSound
} }
} }
void SoundManager::stopMusic()
{
if (music)
music->stop();
setPlaylist();
}
void SoundManager::streamMusicFull(const std::string& filename) void SoundManager::streamMusicFull(const std::string& filename)
{ {
@ -327,7 +334,11 @@ namespace MWSound
{ {
const Files::PathContainer* previousPlaylist; const Files::PathContainer* previousPlaylist;
previousPlaylist = mCurrentPlaylist; previousPlaylist = mCurrentPlaylist;
if(mMusicLibrary.containsSection(playlist, mFSStrict)) if (playlist == "")
{
mCurrentPlaylist = mMusicLibrary.section(playlist, mFSStrict);
}
else if(mMusicLibrary.containsSection(playlist, mFSStrict))
{ {
mCurrentPlaylist = mMusicLibrary.section(playlist, mFSStrict); mCurrentPlaylist = mMusicLibrary.section(playlist, mFSStrict);
} }

3
apps/openmw/mwsound/soundmanager.hpp
View file

@ -99,6 +99,9 @@ namespace MWSound
MWWorld::Environment& environment); MWWorld::Environment& environment);
~SoundManager(); ~SoundManager();
void stopMusic();
///< Stops music if it's playing
void streamMusic(const std::string& filename); void streamMusic(const std::string& filename);
///< Play a soundifle ///< Play a soundifle
/// \param filename name of a sound file in "Music/" in the data directory. /// \param filename name of a sound file in "Music/" in the data directory.