Various work on the audio code.

[dcpomatic.git] / src / lib / audio_decoder.h

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a777592c258f282b0e1dc73384f6174128a4881a..68e99608fb2b42c2631d718018a59ebd8af685f5 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -45,19 +45,22 @@ class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public
 public:
        AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
 
+       boost::optional<ContentTime> position () const;
+       void set_position (AudioStreamPtr stream, ContentTime position);
+
        void set_fast ();
        void flush ();
 
        void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
 
-       boost::signals2::signal<void (ContentAudio)> Data;
+       boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
        boost::optional<ContentTime> position () const;
 
 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, boost::shared_ptr<AudioDecoderStream> > _streams;
+       std::map<AudioStreamPtr, ContentTime> _positions;
 };
 
 #endif