mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed longstanding avail compute bug. Cosmetic fixes

Browse source
This commit is contained in:
Abramo Bagnara 2001-02-14 09:36:00 +00:00
parent 31fcb58e9d
commit c71b72ee27
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pcm/pcm_hw.c
View file

@ -496,9 +496,10 @@ static void snd_pcm_hw_dump(snd_pcm_t *pcm, snd_output_t *out)
{ {
snd_pcm_hw_t *hw = pcm->private_data; snd_pcm_hw_t *hw = pcm->private_data;
char *name = "Unknown"; char *name = "Unknown";
snd_card_get_name(hw->card, &name); int err = snd_card_get_name(hw->card, &name);
assert(err >= 0);
snd_output_printf(out, "Hardware PCM card %d '%s' device %d subdevice %d\n", snd_output_printf(out, "Hardware PCM card %d '%s' device %d subdevice %d\n",
hw->card, name, hw->device, hw->subdevice); hw->card, name, hw->device, hw->subdevice);
free(name); free(name);
if (pcm->setup) { if (pcm->setup) {
snd_output_printf(out, "\nIts setup is:\n"); snd_output_printf(out, "\nIts setup is:\n");

9
src/pcm/pcm_local.h
View file

@ -208,7 +208,9 @@ static inline snd_pcm_uframes_t snd_pcm_mmap_playback_avail(snd_pcm_t *pcm)
{ {
snd_pcm_sframes_t avail; snd_pcm_sframes_t avail;
avail = *pcm->hw_ptr + pcm->buffer_size - *pcm->appl_ptr; avail = *pcm->hw_ptr + pcm->buffer_size - *pcm->appl_ptr;
if (avail < 0) if (avail >= pcm->boundary)
avail -= pcm->boundary;
else if (avail < 0)
avail += pcm->boundary; avail += pcm->boundary;
return avail; return avail;
} }
@ -226,8 +228,11 @@ static inline snd_pcm_uframes_t snd_pcm_mmap_avail(snd_pcm_t *pcm)
{ {
snd_pcm_sframes_t avail; snd_pcm_sframes_t avail;
avail = *pcm->hw_ptr - *pcm->appl_ptr; avail = *pcm->hw_ptr - *pcm->appl_ptr;
if (pcm->stream == SND_PCM_STREAM_PLAYBACK) if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
avail += pcm->buffer_size; avail += pcm->buffer_size;
if (avail >= pcm->boundary)
avail -= pcm->boundary;
}
if (avail < 0) if (avail < 0)
avail += pcm->boundary; avail += pcm->boundary;
return avail; return avail;