VIDEO: Allow for disabling of automatic audio sync in AdvancedVideoDecoder

2 files changed, 14 insertions, 5 deletions

diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 07fd225dcf..3312b2530d 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -194,12 +194,14 @@ uint32 AdvancedVideoDecoder::getTime() const {
 	if (isPaused())
 		return _pauseStartTime - _startTime;
 
-	for (TrackList::const_iterator it = _tracks.begin(); it != _tracks.end(); it++) {
-		if ((*it)->getTrackType() == Track::kTrackTypeAudio) {
-			uint32 time = ((const AudioTrack *)*it)->getRunningTime();
+	if (useAudioSync()) {
+		for (TrackList::const_iterator it = _tracks.begin(); it != _tracks.end(); it++) {
+			if ((*it)->getTrackType() == Track::kTrackTypeAudio) {
+				uint32 time = ((const AudioTrack *)*it)->getRunningTime();
 
-			if (time != 0)
-				return time + _audioStartOffset.msecs();
+				if (time != 0)
+					return time + _audioStartOffset.msecs();
+			}
 		}
 	}
 
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 87d832eeb9..9496148de6 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -625,6 +625,13 @@ protected:
 	 */
 	void addTrack(Track *track);
 
+	/**
+	 * Whether or not getTime() will sync with a playing audio track.
+	 *
+	 * A subclass should override this to disable this feature.
+	 */
+	virtual bool useAudioSync() const { return true; }
+
 private:
 	// Tracks owned by this AdvancedVideoDecoder
 	typedef Common::List<Track *> TrackList;