From e48745b68ec25b351b4dd511dac1c1c1bb00e647 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 20 Mar 2012 12:39:49 -0700 Subject: [PATCH] Fix streamMusic's path lookup --- apps/openmw/mwsound/soundmanager.cpp | 9 +++++++-- apps/openmw/mwsound/soundmanager.hpp | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index 7b3346331..ec5ab310b 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -155,7 +155,7 @@ namespace MWSound mMusic.reset(); } - void SoundManager::streamMusic(const std::string& filename) + void SoundManager::streamMusicFull(const std::string& filename) { std::cout <<"Playing "<size(); - streamMusic((*filelist)[i]); + streamMusicFull((*filelist)[i]); } bool SoundManager::isMusicPlaying() diff --git a/apps/openmw/mwsound/soundmanager.hpp b/apps/openmw/mwsound/soundmanager.hpp index 206b7a1b9..f350da2be 100644 --- a/apps/openmw/mwsound/soundmanager.hpp +++ b/apps/openmw/mwsound/soundmanager.hpp @@ -58,6 +58,7 @@ namespace MWSound MWWorld::Ptr ptr, const std::string &id, float volume, float pitch, float min, float max, bool loop, bool untracked=false); + void streamMusicFull(const std::string& filename); bool isPlaying(MWWorld::Ptr ptr, const std::string &id) const; void updateRegionSound(float duration);