swaroop: beginnings of DCP -> ecinema support.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5356c5ce2fd8aae6786493b10c4052e59fab43a8..d8ffd2c6b8acc2c23e9abf3cf184c15172d7fe00 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -39,6 +39,10 @@ public:
                bool mixdown_to_stereo,
                bool split_reels,
                int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+               , boost::optional<dcp::Key> key
+               , boost::optional<std::string> id
+#endif
                );
 
        void go ();
@@ -59,12 +63,15 @@ private:
                        int video_frame_rate,
                        int audio_frame_rate,
                        int channels,
-                       boost::shared_ptr<Log> log,
                        ExportFormat,
                        int x264_crf,
                        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;
@@ -79,7 +86,7 @@ private:
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;