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

Handle the wav -> mp3 extension conversion in the sound output backend

Browse source
This commit is contained in:
Chris Robinson 2012-03-21 22:49:40 -07:00
parent f11e3e39a1
commit 15317796bf
3 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -238,17 +238,7 @@ size_t FFmpeg_Decoder::MyStream::readAVAudioData(void *data, size_t length)
void FFmpeg_Decoder::open(const std::string &fname) void FFmpeg_Decoder::open(const std::string &fname)
{ {
close(); close();
try
{
mDataStream = mResourceMgr.openResource(fname); mDataStream = mResourceMgr.openResource(fname);
}
catch(Ogre::Exception &e)
{
std::string::size_type pos = fname.rfind('.');
if(pos == std::string::npos)
throw;
mDataStream = mResourceMgr.openResource(fname.substr(0, pos)+".mp3");
}
if((mFormatCtx=avformat_alloc_context()) == NULL) if((mFormatCtx=avformat_alloc_context()) == NULL)
fail("Failed to allocate context"); fail("Failed to allocate context");

10
apps/openmw/mwsound/mpgsnd_decoder.cpp
View file

@ -81,17 +81,7 @@ off_t MpgSnd_Decoder::ogrempg_lseek(void *user_data, off_t offset, int whence)
void MpgSnd_Decoder::open(const std::string &fname) void MpgSnd_Decoder::open(const std::string &fname)
{ {
close(); close();
try
{
mDataStream = mResourceMgr.openResource(fname); mDataStream = mResourceMgr.openResource(fname);
}
catch(Ogre::Exception &e)
{
std::string::size_type pos = fname.rfind('.');
if(pos == std::string::npos)
throw;
mDataStream = mResourceMgr.openResource(fname.substr(0, pos)+".mp3");
}
SF_VIRTUAL_IO streamIO = { SF_VIRTUAL_IO streamIO = {
ogresf_get_filelen, ogresf_seek, ogresf_get_filelen, ogresf_seek,

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

@ -465,7 +465,17 @@ ALuint OpenAL_Output::getBuffer(const std::string &fname)
int srate; int srate;
DecoderPtr decoder = mManager.getDecoder(); DecoderPtr decoder = mManager.getDecoder();
try
{
decoder->open(fname); decoder->open(fname);
}
catch(Ogre::FileNotFoundException &e)
{
std::string::size_type pos = fname.rfind('.');
if(pos == std::string::npos)
throw;
decoder->open(fname.substr(0, pos)+".mp3");
}
decoder->getInfo(&srate, &chans, &type); decoder->getInfo(&srate, &chans, &type);
format = getALFormat(chans, type); format = getALFormat(chans, type);