teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Avoid an unnecessary string copy

Browse source
This commit is contained in:
Chris Robinson 2015-11-25 01:05:55 -08:00
parent aac903484c
commit a1bdb544db
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwsound/openal_output.cpp
View file

@ -773,14 +773,16 @@ Sound_Handle OpenAL_Output::loadSound(const std::string &fname)
DecoderPtr decoder = mManager.getDecoder(); DecoderPtr decoder = mManager.getDecoder();
// Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav. // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
std::string file = fname; if(decoder->mResourceMgr->exists(fname))
if (!decoder->mResourceMgr->exists(file)) decoder->open(fname);
else
{ {
std::string file = fname;
std::string::size_type pos = file.rfind('.'); std::string::size_type pos = file.rfind('.');
if(pos != std::string::npos) if(pos != std::string::npos)
file = file.substr(0, pos)+".mp3"; file = file.substr(0, pos)+".mp3";
decoder->open(file);
} }
decoder->open(file);
std::vector<char> data; std::vector<char> data;
ChannelConfig chans; ChannelConfig chans;