Revert the last fix: finer sync of dmix in delay callback

The fix to enable finer sync of dmix in delay callback seems
rather harmful for some apps like xmms on SMP.
The problem of aoss was solved by max_periods=0, so better to
revert this change.

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index be7fe8d285d554207b48f6a1ac43bec4b09fe15f..d8cc8adf88d73598fee74bd84cf195b81c4d4e47 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -437,7 +437,6 @@ static int snd_pcm_dmix_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
                if (err < 0)
                        return err;
                /* fallthru */
-               snd_pcm_dmix_sync_area(pcm);
        case SNDRV_PCM_STATE_PREPARED:
        case SNDRV_PCM_STATE_SUSPENDED:
        case STATE_RUN_PENDING:

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index eac58ba6ed2325b715ea2ade4c85e59d2e8c8fef..3c65e2cae5e1a3269ae445f69e7eca232e6c0a7b 100644 (file)
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -617,12 +617,7 @@ static int snd_pcm_rate_hwsync(snd_pcm_t *pcm)
 
 static int snd_pcm_rate_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
 {
-       snd_pcm_rate_t *rate = pcm->private_data;
        snd_pcm_rate_hwsync(pcm);
-       /* call slave's delay callback although the value is overwritten.
-        * it's needed for a better sync of dmix on aoss.
-        */
-       snd_pcm_delay(rate->gen.slave, delayp);
        if (pcm->stream == SND_PCM_STREAM_PLAYBACK)
                *delayp = snd_pcm_mmap_playback_hw_avail(pcm);
        else