/*
- 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
#include "decoder.h"
#include "content.h"
#include "audio_content.h"
-#include "decoded.h"
+#include "content_audio.h"
class AudioBuffers;
class Resampler;
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 (after resampling, if applicable)
+ * @param length Frames to get (after resampling, if applicable)
+ * @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 ();
+ void reset_decoded_audio ();
+ void add (boost::shared_ptr<const AudioBuffers>);
boost::shared_ptr<const AudioContent> _audio_content;
boost::shared_ptr<Resampler> _resampler;
- boost::optional<ContentTime> _audio_position;
+ boost::shared_ptr<AudioProcessor> _processor;
+ boost::optional<AudioFrame> _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
+ data at the seek time.
+ */
+ boost::optional<ContentTime> _seek_reference;
};
#endif