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.
This commit is contained in:
Takashi Iwai 2006-04-12 12:31:39 +02:00
parent b23872d618
commit 0b9612772c
2 changed files with 0 additions and 6 deletions

View file

@ -437,7 +437,6 @@ static int snd_pcm_dmix_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
if (err < 0) if (err < 0)
return err; return err;
/* fallthru */ /* fallthru */
snd_pcm_dmix_sync_area(pcm);
case SNDRV_PCM_STATE_PREPARED: case SNDRV_PCM_STATE_PREPARED:
case SNDRV_PCM_STATE_SUSPENDED: case SNDRV_PCM_STATE_SUSPENDED:
case STATE_RUN_PENDING: case STATE_RUN_PENDING:

View file

@ -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) 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); 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) if (pcm->stream == SND_PCM_STREAM_PLAYBACK)
*delayp = snd_pcm_mmap_playback_hw_avail(pcm); *delayp = snd_pcm_mmap_playback_hw_avail(pcm);
else else