pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Date: Tue, 01 Feb 2005 17:53:07 -0800

Browse source 
From: Bill May
Subject: [SDL] Diffs for dsp audio in case of failures.

The rewrite recently done for 1.2.8 forgot to handle error cases
by closing the audio.

Here is a patch that does.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401038
This commit is contained in:
Sam Lantinga 2005-02-12 19:39:08 +00:00
parent 999b432dc5
commit b359512630
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/audio/dsp/SDL_dspaudio.c
View file

@ -187,6 +187,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
flags &= ~O_NONBLOCK;
if ( fcntl(audio_fd, F_SETFL, flags) < 0 ) {
SDL_SetError("Couldn't set audio blocking mode");
DSP_CloseAudio(this);
return(-1);
}
}
@ -195,6 +196,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
if ( ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0 ) {
perror("SNDCTL_DSP_GETFMTS");
SDL_SetError("Couldn't get audio format list");
DSP_CloseAudio(this);
return(-1);
}
@ -252,6 +254,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
}
if ( format == 0 ) {
SDL_SetError("Couldn't find any hardware audio formats");
DSP_CloseAudio(this);
return(-1);
}
spec->format = test_format;
@ -262,6 +265,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
(value != format) ) {
perror("SNDCTL_DSP_SETFMT");
SDL_SetError("Couldn't set audio format");
DSP_CloseAudio(this);
return(-1);
}
@ -270,6 +274,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &value) < 0 ) {
perror("SNDCTL_DSP_CHANNELS");
SDL_SetError("Cannot set the number of channels");
DSP_CloseAudio(this);
return(-1);
}
spec->channels = value;
@ -279,6 +284,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
if ( ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0 ) {
perror("SNDCTL_DSP_SPEED");
SDL_SetError("Couldn't set audio frequency");
DSP_CloseAudio(this);
return(-1);
}
spec->freq = value;
@ -290,6 +296,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
for ( frag_spec = 0; (0x01<<frag_spec) < spec->size; ++frag_spec );
if ( (0x01<<frag_spec) != spec->size ) {
SDL_SetError("Fragment size must be a power of two");
DSP_CloseAudio(this);
return(-1);
}
frag_spec |= 0x00020000; /* two fragments, for low latency */
@ -317,6 +324,7 @@ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
mixlen = spec->size;
mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen);
if ( mixbuf == NULL ) {
DSP_CloseAudio(this);
return(-1);
}
memset(mixbuf, spec->silence, spec->size);