summaryrefslogtreecommitdiff
path: root/src/lib/audio_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-12-13 14:51:39 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit22b13599407e45d85d1c83e0805aa14965b0ab19 (patch)
tree38aa5015affeca6ad390a7951c8ebf24d64f4d05 /src/lib/audio_decoder.h
parenta78b741c43830c84bcb4d18e3147746f13a668e5 (diff)
Post-merge tidy-up.
Diffstat (limited to 'src/lib/audio_decoder.h')
-rw-r--r--src/lib/audio_decoder.h6
1 files changed, 2 insertions, 4 deletions
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;
};