mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2024-10-28 03:09:36 +01:00
Don't close audio streams until we're sure we've found a file, and always attempt to load the requested file if the stream is closed.
This matches RGSS's behavior should an Audio method be called for a non-existent file, and prevents a segfault if an attempt raises an error and then play is called again for the previously playing file. As part of this fix, we're now storing the SDL_RWops for audio streams directly in the source structs.
This commit is contained in:
parent
1462dc9623
commit
891b1fd9f7
5 changed files with 48 additions and 58 deletions
|
@ -90,18 +90,7 @@ void ALStream::close()
|
|||
|
||||
void ALStream::open(const std::string &filename)
|
||||
{
|
||||
checkStopped();
|
||||
|
||||
switch (state)
|
||||
{
|
||||
case Playing:
|
||||
case Paused:
|
||||
stopStream();
|
||||
case Stopped:
|
||||
closeSource();
|
||||
case Closed:
|
||||
openSource(filename);
|
||||
}
|
||||
openSource(filename);
|
||||
|
||||
state = Stopped;
|
||||
}
|
||||
|
@ -201,32 +190,27 @@ void ALStream::closeSource()
|
|||
|
||||
struct ALStreamOpenHandler : FileSystem::OpenHandler
|
||||
{
|
||||
SDL_RWops *srcOps;
|
||||
bool looped;
|
||||
ALDataSource *source;
|
||||
int fallbackMode;
|
||||
std::string errorMsg;
|
||||
|
||||
ALStreamOpenHandler(SDL_RWops &srcOps, bool looped)
|
||||
: srcOps(&srcOps), looped(looped), source(0), fallbackMode(0)
|
||||
ALStreamOpenHandler(bool looped)
|
||||
: looped(looped), source(0), fallbackMode(0)
|
||||
{}
|
||||
|
||||
bool tryRead(SDL_RWops &ops, const char *ext)
|
||||
{
|
||||
/* Copy this because we need to keep it around,
|
||||
* as we will continue reading data from it later */
|
||||
*srcOps = ops;
|
||||
|
||||
/* Try to read ogg file signature */
|
||||
char sig[5] = { 0 };
|
||||
SDL_RWread(srcOps, sig, 1, 4);
|
||||
SDL_RWseek(srcOps, 0, RW_SEEK_SET);
|
||||
SDL_RWread(&ops, sig, 1, 4);
|
||||
SDL_RWseek(&ops, 0, RW_SEEK_SET);
|
||||
|
||||
try
|
||||
{
|
||||
if (!strcmp(sig, "OggS"))
|
||||
{
|
||||
source = createVorbisSource(*srcOps, looped);
|
||||
source = createVorbisSource(ops, looped);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -236,12 +220,12 @@ struct ALStreamOpenHandler : FileSystem::OpenHandler
|
|||
|
||||
if (HAVE_FLUID)
|
||||
{
|
||||
source = createMidiSource(*srcOps, looped);
|
||||
source = createMidiSource(ops, looped);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
source = createSDLSource(*srcOps, ext, STREAM_BUF_SIZE, looped, fallbackMode);
|
||||
source = createSDLSource(ops, ext, STREAM_BUF_SIZE, looped, fallbackMode);
|
||||
}
|
||||
catch (const Exception &e)
|
||||
{
|
||||
|
@ -257,21 +241,31 @@ struct ALStreamOpenHandler : FileSystem::OpenHandler
|
|||
|
||||
void ALStream::openSource(const std::string &filename)
|
||||
{
|
||||
ALStreamOpenHandler handler(srcOps, looped);
|
||||
shState->fileSystem().openRead(handler, filename.c_str());
|
||||
source = handler.source;
|
||||
needsRewind.clear();
|
||||
ALStreamOpenHandler handler(looped);
|
||||
try
|
||||
{
|
||||
shState->fileSystem().openRead(handler, filename.c_str());
|
||||
} catch (const Exception &e)
|
||||
{
|
||||
/* If no file was found then we leave the stream open.
|
||||
* A PHYSFSError means we found a match but couldn't
|
||||
* open the file, so we'll close it in that case. */
|
||||
if (e.type != Exception::NoFileError)
|
||||
close();
|
||||
|
||||
throw e;
|
||||
}
|
||||
|
||||
close();
|
||||
|
||||
// Try fallback mode, e.g. for handling S32->F32 sample format conversion
|
||||
if (!source)
|
||||
if (!handler.source)
|
||||
{
|
||||
handler.fallbackMode = 1;
|
||||
shState->fileSystem().openRead(handler, filename.c_str());
|
||||
source = handler.source;
|
||||
needsRewind.clear();
|
||||
}
|
||||
|
||||
if (!source)
|
||||
if (!handler.source)
|
||||
{
|
||||
char buf[512];
|
||||
snprintf(buf, sizeof(buf), "Unable to decode audio stream: %s: %s",
|
||||
|
@ -279,6 +273,9 @@ void ALStream::openSource(const std::string &filename)
|
|||
|
||||
Debug() << buf;
|
||||
}
|
||||
|
||||
source = handler.source;
|
||||
needsRewind.clear();
|
||||
}
|
||||
|
||||
void ALStream::stopStream()
|
||||
|
|
|
@ -74,8 +74,6 @@ struct ALStream
|
|||
uint64_t procFrames;
|
||||
AL::Buffer::ID lastBuf;
|
||||
|
||||
SDL_RWops srcOps;
|
||||
|
||||
struct
|
||||
{
|
||||
ALenum format;
|
||||
|
|
|
@ -113,31 +113,26 @@ void AudioStream::play(const std::string &filename,
|
|||
/* Requested audio file is different from current one */
|
||||
bool diffFile = (filename != current.filename);
|
||||
|
||||
switch (sState)
|
||||
if (diffFile || sState == ALStream::Closed)
|
||||
{
|
||||
case ALStream::Paused :
|
||||
case ALStream::Playing :
|
||||
stream.stop();
|
||||
case ALStream::Stopped :
|
||||
if (diffFile)
|
||||
stream.close();
|
||||
case ALStream::Closed :
|
||||
if (diffFile)
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
/* This will throw on errors while
|
||||
* opening the data source */
|
||||
stream.open(filename);
|
||||
}
|
||||
catch (const Exception &e)
|
||||
{
|
||||
unlockStream();
|
||||
throw e;
|
||||
}
|
||||
/* This will throw on errors while
|
||||
* opening the data source */
|
||||
stream.open(filename);
|
||||
}
|
||||
catch (const Exception &e)
|
||||
{
|
||||
unlockStream();
|
||||
throw e;
|
||||
}
|
||||
} else {
|
||||
switch (sState)
|
||||
{
|
||||
case ALStream::Paused :
|
||||
case ALStream::Playing :
|
||||
stream.stop();
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
setVolume(Base, _volume);
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
struct SDLSoundSource : ALDataSource
|
||||
{
|
||||
Sound_Sample *sample;
|
||||
SDL_RWops &srcOps;
|
||||
SDL_RWops srcOps;
|
||||
uint8_t sampleSize;
|
||||
bool looped;
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ static ov_callbacks OvCallbacks =
|
|||
|
||||
struct VorbisSource : ALDataSource
|
||||
{
|
||||
SDL_RWops &src;
|
||||
SDL_RWops src;
|
||||
|
||||
OggVorbis_File vf;
|
||||
|
||||
|
|
Loading…
Reference in a new issue