VIDEO: Add support for a track filtering callback function

This is needed for Starship Titanic, where videos can have a secondary
video track. It was simpler to use the callback as a means to select
one video track each across two decoders than trying to make VideoDecoder
and/or AVIDecoder support decoding from multiple video tracks simultaneously

1 files changed, 8 insertions, 2 deletions

diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 96d9e821ff..04e6a1847e 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -61,8 +61,10 @@ namespace Video {
  */
 class AVIDecoder : public VideoDecoder {
 public:
-	AVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType);
-	AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType);
+	typedef bool(*SelectTrackFn)(bool isVideo, int trackNumber);
+	AVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType, SelectTrackFn trackFn = nullptr);
+	AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType,
+		SelectTrackFn trackFn = nullptr);
 	virtual ~AVIDecoder();
 
 	bool loadStream(Common::SeekableReadStream *stream);
@@ -268,6 +270,10 @@ protected:
 
 	Audio::Mixer::SoundType _soundType;
 	Common::Rational _frameRateOverride;
+
+	int _videoTrackCounter, _audioTrackCounter;
+	SelectTrackFn _selectTrackFn;
+
 	void initCommon();
 
 	bool parseNextChunk();