Various fixes to push audio vaguely in the right direction.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 10d88d1ec..a4b74e2ea 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -43,22 +43,16 @@ class Log;
 class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
-
-	boost::optional<ContentTime> position () const;
-
-	void set_fast ();
-	void flush ();
+	AudioDecoder (Decoder* parent, boost::shared_ptr<AudioContent> content, boost::shared_ptr<Log> log);
 
+	ContentTime position () const;
 	void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void seek ();
 
 	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
-	/** An AudioDecoderStream object to manage each stream in _audio_content */
-	typedef std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > StreamMap;
-	StreamMap _streams;
-	std::map<AudioStreamPtr, ContentTime> _positions;
+	std::map<AudioStreamPtr, Frame> _positions;
 };
 
 #endif