zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-17 17:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup creating decoders

Browse source
This commit is contained in:
Chris Robinson 2014-06-19 22:46:46 -07:00
parent 9f493fca5f
commit e2708c8b3e
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/sound/i_sound.cpp
View file

@ -543,22 +543,19 @@ SoundDecoder *SoundRenderer::CreateDecoder(const BYTE *sfxdata, int length)
SoundDecoder *decoder = NULL;
#ifdef HAVE_MPG123
decoder = new MPG123Decoder;
if(!decoder->open((const char*)sfxdata, length))
{
delete decoder;
decoder = NULL;
}
if(decoder->open((const char*)sfxdata, length))
return decoder;
delete decoder;
decoder = NULL;
#endif
#ifdef HAVE_SNDFILE
if(!decoder)
{
decoder = new SndFileDecoder;
if(!decoder->open((const char*)sfxdata, length))
{
delete decoder;
decoder = NULL;
}
}
decoder = new SndFileDecoder;
if(decoder->open((const char*)sfxdata, length))
return decoder;
delete decoder;
decoder = NULL;
#endif
return decoder;
}
@ -568,19 +565,19 @@ SoundDecoder* SoundRenderer::CreateDecoder(const char *fname, int offset, int le
SoundDecoder *decoder = NULL;
#ifdef HAVE_MPG123
decoder = new MPG123Decoder;
if(!decoder->open(fname, offset, length))
{
delete decoder;
decoder = NULL;
}
if(decoder->open(fname, offset, length))
return decoder;
delete decoder;
decoder = NULL;
#endif
#ifdef HAVE_SNDFILE
decoder = new SndFileDecoder;
if(!decoder->open(fname, offset, length))
{
delete decoder;
decoder = NULL;
}
if(decoder->open(fname, offset, length))
return decoder;
delete decoder;
decoder = NULL;
#endif
return decoder;
}