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

Corrected misuse of snd_pcm_writei() in ALSA driver.

Browse source 
Hopefully fixes Bugzilla #650.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404056
This commit is contained in:
Ryan C. Gordon 2009-10-12 08:06:40 +00:00
parent 56967065f7
commit c865dbf891
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/audio/alsa/SDL_alsa_audio.c
View file

@ -304,17 +304,18 @@ static __inline__ void swizzle_alsa_channels(_THIS)
static void ALSA_PlayAudio(_THIS)
{
int status;
int sample_len;
signed short *sample_buf;
int status;
snd_pcm_uframes_t frames_left;
const Uint8 *sample_buf = (const Uint8 *) mixbuf;
const int frame_size = ( ((int) this->spec.channels) *
((int) (this->spec.format & 0xFF)) );
swizzle_alsa_channels(this);
sample_len = this->spec.samples;
sample_buf = (signed short *)mixbuf;
frames_left = ((snd_pcm_uframes_t) this->spec.samples) / this->spec.channels;
while ( sample_len > 0 ) {
status = SDL_NAME(snd_pcm_writei)(pcm_handle, sample_buf, sample_len);
while ( frames_left > 0 ) {
status = SDL_NAME(snd_pcm_writei)(pcm_handle, sample_buf, frames_left);
if ( status < 0 ) {
if ( status == -EAGAIN ) {
SDL_Delay(1);
@ -336,8 +337,8 @@ static void ALSA_PlayAudio(_THIS)
}
continue;
}
sample_buf += status * this->spec.channels;
sample_len -= status;
sample_buf += status * frame_size;
frames_left -= status;
}
}