diff options
Diffstat (limited to 'src/lib/audio_decoder.h')
| -rw-r--r-- | src/lib/audio_decoder.h | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index cfe94b528..1da8a676f 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -21,38 +21,36 @@ * @brief Parent class for audio decoders. */ -#ifndef DVDOMATIC_AUDIO_DECODER_H -#define DVDOMATIC_AUDIO_DECODER_H +#ifndef DCPOMATIC_AUDIO_DECODER_H +#define DCPOMATIC_AUDIO_DECODER_H #include "audio_source.h" -#include "stream.h" #include "decoder.h" +extern "C" { +#include <libswresample/swresample.h> +} + +class AudioContent; /** @class AudioDecoder. * @brief Parent class for audio decoders. */ -class AudioDecoder : public TimedAudioSource, public virtual Decoder +class AudioDecoder : public AudioSource, public virtual Decoder { public: - AudioDecoder (boost::shared_ptr<Film>, DecodeOptions); + AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>); + ~AudioDecoder (); - virtual void set_audio_stream (boost::shared_ptr<AudioStream>); +protected: - /** @return Audio stream that we are using */ - boost::shared_ptr<AudioStream> audio_stream () const { - return _audio_stream; - } + void audio (boost::shared_ptr<const AudioBuffers>, Time); + bool audio_done () const; - /** @return All available audio streams */ - std::vector<boost::shared_ptr<AudioStream> > audio_streams () const { - return _audio_streams; - } + Time _next_audio; + boost::shared_ptr<const AudioContent> _audio_content; -protected: - /** Audio stream that we are using */ - boost::shared_ptr<AudioStream> _audio_stream; - /** All available audio streams */ - std::vector<boost::shared_ptr<AudioStream> > _audio_streams; +private: + SwrContext* _swr_context; }; #endif |
