mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: fix the pcm_frames_diff -> pcm_frame_diff typo

Browse source 
BugLink: https://github.com/alsa-project/alsa-lib/issues/85
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-10-14 17:55:18 +02:00
parent ebe2f8b851
commit 0128af6f54
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pcm/pcm_dmix.c
View file

@ -716,7 +716,7 @@ static snd_pcm_sframes_t snd_pcm_dmix_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t f
* So they can be remixed. * So they can be remixed.
*/ */
size = pcm_frames_diff(dmix->last_appl_ptr, dmix->appl_ptr, pcm->boundary); size = pcm_frame_diff(dmix->last_appl_ptr, dmix->appl_ptr, pcm->boundary);
if (frames < size) if (frames < size)
size = frames; size = frames;
snd_pcm_mmap_appl_backward(pcm, size); snd_pcm_mmap_appl_backward(pcm, size);
@ -728,10 +728,10 @@ static snd_pcm_sframes_t snd_pcm_dmix_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t f
/* Always at this point last_appl_ptr == appl_ptr /* Always at this point last_appl_ptr == appl_ptr
* So (appl_ptr - hw_ptr) indicates the frames which can be remixed * So (appl_ptr - hw_ptr) indicates the frames which can be remixed
*/ */
size = pcm_frames_diff(dmix->appl_ptr, dmix->hw_ptr, pcm->boundary); size = pcm_frame_diff(dmix->appl_ptr, dmix->hw_ptr, pcm->boundary);
if (size > frames) if (size > frames)
size = frames; size = frames;
slave_size = pcm_frames_diff(dmix->slave_appl_ptr, dmix->slave_hw_ptr, pcm->boundary); slave_size = pcm_frame_diff(dmix->slave_appl_ptr, dmix->slave_hw_ptr, pcm->boundary);
if (slave_size < size) if (slave_size < size)
size = slave_size; size = slave_size;

6
src/pcm/pcm_dshare.c
View file

@ -112,7 +112,7 @@ static void snd_pcm_dshare_sync_area(snd_pcm_t *pcm)
const snd_pcm_channel_area_t *src_areas, *dst_areas; const snd_pcm_channel_area_t *src_areas, *dst_areas;
/* calculate the size to transfer */ /* calculate the size to transfer */
size = pcm_frames_diff(dshare->appl_ptr, dshare->last_appl_ptr, pcm->boundary); size = pcm_frame_diff(dshare->appl_ptr, dshare->last_appl_ptr, pcm->boundary);
if (! size) if (! size)
return; return;
slave_hw_ptr = dshare->slave_hw_ptr; slave_hw_ptr = dshare->slave_hw_ptr;
@ -123,7 +123,7 @@ static void snd_pcm_dshare_sync_area(snd_pcm_t *pcm)
slave_hw_ptr += dshare->slave_buffer_size; slave_hw_ptr += dshare->slave_buffer_size;
if (slave_hw_ptr >= dshare->slave_boundary) if (slave_hw_ptr >= dshare->slave_boundary)
slave_hw_ptr -= dshare->slave_boundary; slave_hw_ptr -= dshare->slave_boundary;
slave_size = pcm_frames_diff(slave_hw_ptr, dshare->slave_appl_ptr, dshare->slave_boundary); slave_size = pcm_frame_diff(slave_hw_ptr, dshare->slave_appl_ptr, dshare->slave_boundary);
if (slave_size < size) if (slave_size < size)
size = slave_size; size = slave_size;
if (! size) if (! size)
@ -166,7 +166,7 @@ static int snd_pcm_dshare_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_p
old_slave_hw_ptr = dshare->slave_hw_ptr; old_slave_hw_ptr = dshare->slave_hw_ptr;
dshare->slave_hw_ptr = slave_hw_ptr; dshare->slave_hw_ptr = slave_hw_ptr;
diff = pcm_frames_diff(slave_hw_ptr, old_slave_hw_ptr, dshare->slave_boundary); diff = pcm_frame_diff(slave_hw_ptr, old_slave_hw_ptr, dshare->slave_boundary);
if (diff == 0) /* fast path */ if (diff == 0) /* fast path */
return 0; return 0;
if (dshare->state != SND_PCM_STATE_RUNNING && if (dshare->state != SND_PCM_STATE_RUNNING &&

2
src/pcm/pcm_dsnoop.c
View file

@ -152,7 +152,7 @@ static int snd_pcm_dsnoop_sync_ptr(snd_pcm_t *pcm)
old_slave_hw_ptr = dsnoop->slave_hw_ptr; old_slave_hw_ptr = dsnoop->slave_hw_ptr;
snoop_timestamp(pcm); snoop_timestamp(pcm);
slave_hw_ptr = dsnoop->slave_hw_ptr; slave_hw_ptr = dsnoop->slave_hw_ptr;
diff = pcm_frames_diff(slave_hw_ptr, old_slave_hw_ptr, dsnoop->slave_boundary); diff = pcm_frame_diff(slave_hw_ptr, old_slave_hw_ptr, dsnoop->slave_boundary);
if (diff == 0) /* fast path */ if (diff == 0) /* fast path */
return 0; return 0;
snd_pcm_dsnoop_sync_area(pcm, old_slave_hw_ptr, diff); snd_pcm_dsnoop_sync_area(pcm, old_slave_hw_ptr, diff);