ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-24 13:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Sound related bug fixes from Thilo Schulz

Browse source
This commit is contained in:
Tim Angus 2006-02-26 18:47:39 +00:00
parent c93d8fc185
commit 40a5ee007f
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/client/snd_codec_ogg.c
View file

@ -412,7 +412,7 @@ where we read the whole stream at once.
void *S_OGG_CodecLoad(const char *filename, snd_info_t *info) void *S_OGG_CodecLoad(const char *filename, snd_info_t *info)
{ {
snd_stream_t *stream; snd_stream_t *stream;
unsigned char *buffer; byte *buffer;
int bytesRead; int bytesRead;
// check if input is valid // check if input is valid
@ -452,6 +452,7 @@ void *S_OGG_CodecLoad(const char *filename, snd_info_t *info)
// we don't even have read a single byte // we don't even have read a single byte
if(bytesRead <= 0) if(bytesRead <= 0)
{ {
Z_Free(buffer);
S_OGG_CodecCloseStream(stream); S_OGG_CodecCloseStream(stream);
return NULL; return NULL;

16
code/client/snd_openal.c
View file

@ -1377,7 +1377,23 @@ void S_AL_StartBackgroundTrack( const char *intro, const char *loop )
// Queue the musicBuffers up // Queue the musicBuffers up
for(i = 0; i < NUM_MUSIC_BUFFERS; i++) for(i = 0; i < NUM_MUSIC_BUFFERS; i++)
{
S_AL_MusicProcess(musicBuffers[i]); S_AL_MusicProcess(musicBuffers[i]);
// check whether our stream still exists.
if(!mus_stream)
{
// there was an error in reading which resulted in a
// closed stream. We must bail out or we'll crash.
// deallocate everything we allocated so far:
qalDeleteBuffers(NUM_MUSIC_BUFFERS, musicBuffers);
S_AL_MusicSourceFree();
return;
}
}
qalSourceQueueBuffers(musicSource, NUM_MUSIC_BUFFERS, musicBuffers); qalSourceQueueBuffers(musicSource, NUM_MUSIC_BUFFERS, musicBuffers);
// Set the initial gain property // Set the initial gain property