Use dcp::file_to_string().

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 8765be42674c3fd8a41323c5bf865dfdab2d7071..754321880bcb026c7af361f6ff642eea350ea3f0 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -18,57 +18,62 @@
 
 */
 
+
 /** @file src/lib/audio_decoder.h
  *  @brief Parent class for audio decoders.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #define DCPOMATIC_AUDIO_DECODER_H
 
+
 #include "decoder.h"
 #include "content_audio.h"
 #include "audio_stream.h"
 #include "decoder_part.h"
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 
+
 class AudioBuffers;
 class AudioContent;
 class AudioDecoderStream;
 class Log;
+class Film;
 class Resampler;
 
+
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
+class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-       AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log, bool fast);
+       AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
 
-       ContentTime position () const;
-       void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const;
+       void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
        void seek ();
        void flush ();
 
-       ContentTime stream_position (AudioStreamPtr stream) const;
+       dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
-       /** @return Number of frames of data that were accepted */
        boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
        void silence (int milliseconds);
 
-       boost::shared_ptr<const AudioContent> _content;
+       std::shared_ptr<const AudioContent> _content;
        /** 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;
+       typedef std::map<AudioStreamPtr, std::shared_ptr<Resampler>> ResamplerMap;
        ResamplerMap _resamplers;
 
        bool _fast;
 };
 
+
 #endif