aboutsummaryrefslogtreecommitdiff
path: root/video/avi_decoder.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-10-02 08:20:10 -0400
committerPaul Gilbert2016-10-02 08:20:10 -0400
commit28b2609b927a889b3e3b17da76ab99f642ac72f0 (patch)
treed5e9fb6e032b4e0bc1959cdb1da05350ef350e98 /video/avi_decoder.h
parent90ec4f6ac52fc104f08e796f907f44f6fdde2122 (diff)
downloadscummvm-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.h')
-rw-r--r--video/avi_decoder.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index a3733b579c..7f4431f670 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -62,10 +62,8 @@ namespace Video {
*/
class AVIDecoder : public VideoDecoder {
public:
- 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);
+ AVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType);
+ AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType);
virtual ~AVIDecoder();
bool loadStream(Common::SeekableReadStream *stream);
@@ -287,7 +285,6 @@ protected:
int _videoTrackCounter, _audioTrackCounter;
Track *_lastAddedTrack;
- SelectTrackFn _selectTrackFn;
void initCommon();