diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-26 16:47:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-26 22:32:11 +0100 |
| commit | f188128e2577942f030374631d3cf1324a00624a (patch) | |
| tree | 72c1b82d5b7f90069b7ba2a05e8b209cd527c3e4 /src/lib/audio_decoder.h | |
| parent | c4ea2ff06b31ccd20daadbdc968e397eb13a7e36 (diff) | |
{Video,Audio}Frame -> Frame.
Diffstat (limited to 'src/lib/audio_decoder.h')
| -rw-r--r-- | src/lib/audio_decoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index f8438df52..99e9092b3 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -50,7 +50,7 @@ public: * @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); + boost::shared_ptr<ContentAudio> get_audio (Frame time, Frame length, bool accurate); protected: @@ -63,7 +63,7 @@ protected: boost::shared_ptr<const AudioContent> _audio_content; boost::shared_ptr<Resampler> _resampler; boost::shared_ptr<AudioProcessor> _processor; - boost::optional<AudioFrame> _audio_position; + boost::optional<Frame> _audio_position; /** Currently-available decoded audio data */ ContentAudio _decoded_audio; /** The time of an accurate seek after which we have not yet received any actual |