From: Takashi Iwai Date: Mon, 10 Mar 2008 11:02:26 +0000 (+0100) Subject: dmix skipping first set of samples X-Git-Tag: v1.0.17rc1~14 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=fe8bb134005bf0afeaa9dbd1465f01a575728a35;p=alsa-lib.git dmix skipping first set of samples There was a change in alsa-lib 1.0.16 which looks like it was designed to make dmix skip samples in the case of underruns, but it causes the first sample to be skipped since dmix->slave_hw_ptr == dmix->slave_appl_ptr. The following patch fixes this and fixes a small typo in the comment. From: Mike Gorse --- diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 4d21e9ba..9a6887d5 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -311,9 +311,9 @@ static void snd_pcm_dmix_sync_area(snd_pcm_t *pcm) if (size >= pcm->boundary / 2) size = pcm->boundary - size; - /* the slave_app_ptr can be far behing the slave_hw_ptr */ + /* the slave_app_ptr can be far behind the slave_hw_ptr */ /* reduce mixing and errors here - just skip not catched writes */ - if (dmix->slave_hw_ptr < dmix->slave_appl_ptr) + if (dmix->slave_hw_ptr <= dmix->slave_appl_ptr) slave_size = dmix->slave_appl_ptr - dmix->slave_hw_ptr; else slave_size = dmix->slave_appl_ptr + (dmix->slave_boundary - dmix->slave_hw_ptr);