More automated renaming.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ba1520ef53adc72bd441fdb44f4f816ea4b0f701..8765be42674c3fd8a41323c5bf865dfdab2d7071 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -54,15 +54,19 @@ public:
        ContentTime stream_position (AudioStreamPtr stream) const;
 
        /** @return Number of frames of data that were accepted */
-       boost::signals2::signal<Frame (AudioStreamPtr, ContentAudio)> Data;
+       boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
        void silence (int milliseconds);
 
        boost::shared_ptr<const AudioContent> _content;
-       /** Frame after the last one that was emitted from Data for each AudioStream */
-       std::map<AudioStreamPtr, Frame> _positions;
-       std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > _resamplers;
+       /** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable)
+        *  for each AudioStream.
+        */
+       typedef std::map<AudioStreamPtr, Frame> PositionMap;
+       PositionMap _positions;
+       typedef std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > ResamplerMap;
+       ResamplerMap _resamplers;
 
        bool _fast;
 };