diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-25 13:26:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-25 13:26:40 +0100 |
| commit | d9362bdd24f01e4c833e89d63ac3816f36eae36e (patch) | |
| tree | e1355acbfad222fb14ec386b14dcddce0b212bb5 /src/lib/audio_decoder.h | |
| parent | fd970b185e9357522f5d12d62800df8769764729 (diff) | |
Move resampling back into AudioDecoder and fix various screw-ups with audio in the player.
Diffstat (limited to 'src/lib/audio_decoder.h')
| -rw-r--r-- | src/lib/audio_decoder.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 2ad53da8b..b1ec54a7b 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -29,6 +29,7 @@ #include "audio_content.h" class AudioBuffers; +class Resampler; /** @class AudioDecoder. * @brief Parent class for audio decoders. @@ -36,7 +37,7 @@ class AudioBuffers; class AudioDecoder : public virtual Decoder { public: - AudioDecoder (boost::shared_ptr<const Film>); + AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>); /** Emitted when some audio data is ready */ boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio; @@ -44,7 +45,9 @@ public: protected: void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame); + /** Frame index of next emission (post resampling) */ AudioContent::Frame _audio_position; + boost::shared_ptr<Resampler> _resampler; }; #endif |