From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 12 Apr 2006 10:31:39 +0000 (+0200)
Subject: Revert the last fix: finer sync of dmix in delay callback
X-Git-Tag: v1.0.11~3
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=0b9612772c7da7d4801f3f64605744acc1808af7;p=alsa-lib.git

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 be7fe8d2..d8cc8adf 100644
--- 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 eac58ba6..3c65e2ca 100644
--- 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