diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-25 09:41:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-25 09:41:36 +0000 |
| commit | ee77b3cf5f59f775e75e628aa28e8f2f9f941530 (patch) | |
| tree | bbf9ab4ef1f0f633591889cbbd6b7b65de8f5a57 /src/lib/audio_decoder.h | |
| parent | e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (diff) | |
It builds.
Diffstat (limited to 'src/lib/audio_decoder.h')
| -rw-r--r-- | src/lib/audio_decoder.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 35d9f3560..c83c356b7 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ #include "decoder.h" #include "content.h" #include "audio_content.h" -#include "decoded.h" +#include "content_audio.h" class AudioBuffers; class Resampler; @@ -44,16 +44,25 @@ public: return _audio_content; } - void seek (ContentTime time, bool accurate); + /** Try to fetch some audio from a specific place in this content. + * @param frame Frame to start from. + * @param length Frames to get. + * @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames. + * @return Time-stamped audio data which may or may not be from the location (and of the length) requested. + */ + boost::shared_ptr<ContentAudio> get_audio (AudioFrame time, AudioFrame length, bool accurate); protected: + void seek (ContentTime time, bool accurate); void audio (boost::shared_ptr<const AudioBuffers>, ContentTime); void flush (); boost::shared_ptr<const AudioContent> _audio_content; boost::shared_ptr<Resampler> _resampler; - boost::optional<ContentTime> _audio_position; + boost::optional<AudioFrame> _audio_position; + /** Currently-available decoded audio data */ + ContentAudio _decoded_audio; }; #endif |