diff options
| author | Paul Gilbert | 2016-10-02 08:20:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-02 08:20:10 -0400 |
| commit | 28b2609b927a889b3e3b17da76ab99f642ac72f0 (patch) | |
| tree | d5e9fb6e032b4e0bc1959cdb1da05350ef350e98 /video/avi_decoder.cpp | |
| parent | 90ec4f6ac52fc104f08e796f907f44f6fdde2122 (diff) | |
| download | scummvm-rg350-28b2609b927a889b3e3b17da76ab99f642ac72f0.tar.gz scummvm-rg350-28b2609b927a889b3e3b17da76ab99f642ac72f0.tar.bz2 scummvm-rg350-28b2609b927a889b3e3b17da76ab99f642ac72f0.zip | |
TITANIC: Remove track select logic from AVIDecoder
Diffstat (limited to 'video/avi_decoder.cpp')
| -rw-r--r-- | video/avi_decoder.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 980ce3a3ea..30f87a126a 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -76,13 +76,13 @@ enum { }; -AVIDecoder::AVIDecoder(Audio::Mixer::SoundType soundType, SelectTrackFn trackFn) : - _frameRateOverride(0), _soundType(soundType), _selectTrackFn(trackFn) { +AVIDecoder::AVIDecoder(Audio::Mixer::SoundType soundType) : + _frameRateOverride(0), _soundType(soundType) { initCommon(); } -AVIDecoder::AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType, - SelectTrackFn trackFn) : _frameRateOverride(frameRateOverride), _soundType(soundType), _selectTrackFn(trackFn) { +AVIDecoder::AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType) : + _frameRateOverride(frameRateOverride), _soundType(soundType) { initCommon(); } @@ -293,14 +293,8 @@ void AVIDecoder::handleStreamHeader(uint32 size) { } void AVIDecoder::addTrack(Track *track, bool isExternal) { - if (!_selectTrackFn || - (dynamic_cast<AVIVideoTrack *>(track) && _selectTrackFn(true, _videoTrackCounter++)) || - (dynamic_cast<AVIAudioTrack *>(track) && _selectTrackFn(false, _audioTrackCounter++))) { - VideoDecoder::addTrack(track, isExternal); - _lastAddedTrack = track; - } else { - _lastAddedTrack = nullptr; - } + VideoDecoder::addTrack(track, isExternal); + _lastAddedTrack = track; } void AVIDecoder::readStreamName(uint32 size) { |