Use dcp::file_to_string().

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 4bd264c8bdf6a760cdb251d3b4950557632b8e68..710364b013840779d0fb80fdd204ca7d57960e75 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -32,18 +32,14 @@ class FFmpegEncoder : public Encoder
 {
 public:
        FFmpegEncoder (
-               boost::shared_ptr<const Film> film,
-               boost::weak_ptr<Job> job,
+               std::shared_ptr<const Film> film,
+               std::weak_ptr<Job> job,
                boost::filesystem::path output,
                ExportFormat format,
                bool mixdown_to_stereo,
                bool split_reels,
                bool audio_stream_per_channel,
                int x264_crf
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               , boost::optional<dcp::Key> key
-               , boost::optional<std::string> id
-#endif
                );
 
        void go ();
@@ -70,21 +66,16 @@ private:
                        bool three_d,
                        boost::filesystem::path output,
                        std::string extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                       , boost::optional<dcp::Key> key
-                       , boost::optional<std::string> id
-#endif
                        );
 
-               boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
+               std::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
                void flush ();
-               void audio (boost::shared_ptr<AudioBuffers>);
+               void audio (std::shared_ptr<AudioBuffers>);
 
        private:
-               std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
+               std::map<Eyes, std::shared_ptr<FFmpegFileEncoder> > _encoders;
        };
 
-       std::list<FileEncoderSet> _file_encoders;
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
@@ -92,7 +83,13 @@ private:
 
        EventHistory _history;
 
-       boost::shared_ptr<Butler> _butler;
+       boost::filesystem::path _output;
+       ExportFormat _format;
+       bool _split_reels;
+       bool _audio_stream_per_channel;
+       int _x264_crf;
+
+       std::shared_ptr<Butler> _butler;
 };
 
 #endif