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

Corrected my snd_pcm_writei fix.

Browse source 
Apparently ALSA says "frames" but it means samples...you don't split this into
 groups by number of channels.

The adventure continues.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404076
This commit is contained in:
Ryan C. Gordon 2009-10-13 08:27:28 +00:00
parent 41f37eccc5
commit 8df8f52eb1
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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