#include "content.h"
#include "audio_content.h"
#include "content_audio.h"
+#include <boost/enable_shared_from_this.hpp>
class AudioBuffers;
-class Resampler;
+class AudioDecoderStream;
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
-class AudioDecoder : public virtual Decoder
+class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
{
public:
AudioDecoder (boost::shared_ptr<const AudioContent>);
-
+
boost::shared_ptr<const AudioContent> audio_content () const {
return _audio_content;
}
/** Try to fetch some audio from a specific place in this content.
- * @param frame Frame to start from.
- * @param length Frames to get.
+ * @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:
+ ContentAudio get_audio (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
- void seek (ContentTime time, bool accurate);
- void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+protected:
+ void audio (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
void flush ();
+ void seek (ContentTime t, bool accurate);
+private:
boost::shared_ptr<const AudioContent> _audio_content;
- boost::shared_ptr<Resampler> _resampler;
- boost::optional<AudioFrame> _audio_position;
- /** Currently-available decoded audio data */
- ContentAudio _decoded_audio;
+ /** An AudioDecoderStream object to manage each stream in _audio_content */
+ std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
};
#endif