Post-merge tidy-up.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 68e99608fb2b42c2631d718018a59ebd8af685f5..10d88d1ec5f7f76c516881d93394b6659a9666c0 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -46,7 +46,6 @@ 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 ();
@@ -55,11 +54,10 @@ public:
 
        boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
-       boost::optional<ContentTime> position () const;
-
 private:
        /** An AudioDecoderStream object to manage each stream in _audio_content */
-       std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
+       typedef std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > StreamMap;
+       StreamMap _streams;
        std::map<AudioStreamPtr, ContentTime> _positions;
 };