From 22b13599407e45d85d1c83e0805aa14965b0ab19 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 13 Dec 2016 14:51:39 +0000
Subject: Post-merge tidy-up.

---
 src/lib/audio_decoder.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/lib/audio_decoder.h')

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 68e99608f..10d88d1ec 100644
--- 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;
 };
 
-- 
cgit v1.2.3