diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-19 20:40:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-19 20:40:36 +0000 |
| commit | f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81 (patch) | |
| tree | 6ea2ed1d480304a4aaf512e380cd013bbf42e86c /src/lib/audio_decoder_stream.cc | |
| parent | fab7fa5a9ef1d069c7ca32e3669d0e37e896250c (diff) | |
Move position variables into the video/audio/subtitle decoder classes.
Diffstat (limited to 'src/lib/audio_decoder_stream.cc')
| -rw-r--r-- | src/lib/audio_decoder_stream.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index 7e8e304ef..4f1a2f4ff 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -40,10 +40,13 @@ using std::max; using boost::optional; using boost::shared_ptr; -AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, shared_ptr<Log> log) +AudioDecoderStream::AudioDecoderStream ( + shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, AudioDecoder* audio_decoder, shared_ptr<Log> log + ) : _content (content) , _stream (stream) , _decoder (decoder) + , _audio_decoder (audio_decoder) , _log (log) /* We effectively start having done a seek to zero; this allows silence-padding of the first data that comes out of our decoder. @@ -86,7 +89,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) } if (missing) { - _decoder->maybe_seek_audio (ContentTime::from_frames (*missing, _content->resampled_frame_rate()), accurate); + _audio_decoder->maybe_seek (ContentTime::from_frames (*missing, _content->resampled_frame_rate()), accurate); } /* Offset of the data that we want from the start of _decoded.audio |