|
@@ -810,7 +810,8 @@ static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)
|
|
if (runtime->trigger_master == NULL)
|
|
if (runtime->trigger_master == NULL)
|
|
return;
|
|
return;
|
|
if (runtime->trigger_master == substream) {
|
|
if (runtime->trigger_master == substream) {
|
|
- snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
|
|
|
|
|
|
+ if (!runtime->trigger_tstamp_latched)
|
|
|
|
+ snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
|
|
} else {
|
|
} else {
|
|
snd_pcm_trigger_tstamp(runtime->trigger_master);
|
|
snd_pcm_trigger_tstamp(runtime->trigger_master);
|
|
runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
|
|
runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
|
|
@@ -979,6 +980,7 @@ static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
|
|
!snd_pcm_playback_data(substream))
|
|
!snd_pcm_playback_data(substream))
|
|
return -EPIPE;
|
|
return -EPIPE;
|
|
|
|
+ runtime->trigger_tstamp_latched = false;
|
|
runtime->trigger_master = substream;
|
|
runtime->trigger_master = substream;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|