From dc4e31667e53cbc41227afd3e0d176ca1a80bf82 Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Wed, 27 Jul 2011 14:38:14 +0100 Subject: [PATCH] Recalculate the audio time stamp even when the audiooutput has no visual attached. This fixes a bug introduced in https://github.com/MythTV/mythtv/commit/0affac2f96c903 were MythMusic wasn't updating the time on the playback screen after returning to it. --- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp index e11c1c16081..6b298529453 100644 --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp @@ -1277,15 +1277,16 @@ bool AudioOutputBase::AddData(void *in_buffer, int in_len, .arg(needs_upmix)); // Mythmusic doesn't give us timestamps + if (timecode < 0) + { + // Send original samples to mythmusic visualisation + timecode = (frames_buffered * 1000) / source_samplerate; + frames_buffered += frames; + music = true; + } + if (hasVisual()) { - if (timecode < 0) - { - // Send original samples to mythmusic visualisation - timecode = (frames_buffered * 1000) / source_samplerate; - frames_buffered += frames; - music = true; - } dispatchVisual((uchar *)in_buffer, len, timecode, source_channels, output_settings->FormatToBits(format)); }