]> git.alsa-project.org Git - alsa-lib.git/commitdiff
dmix skipping first set of samples
authorTakashi Iwai <tiwai@suse.de>
Mon, 10 Mar 2008 11:02:26 +0000 (12:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 Mar 2008 11:02:26 +0000 (12:02 +0100)
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 <mgorse@mgorse.dhs.org>

src/pcm/pcm_dmix.c

index 4d21e9badad38438e609a6083f62100f4fdd9838..9a6887d5d298348afd110c051400b068d09a0595 100644 (file)
@@ -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);