Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 79539acce44a24f8f7be9da8f8d1f9030645bc27..df2dcfcc866f5a7535c697274244dd4a3a02d6fa 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -39,11 +39,15 @@ 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 ();
 
-       float current_rate () const;
+       boost::optional<float> current_rate () const;
        Frame frames_done () const;
        bool finishing () const {
                return false;
@@ -64,6 +68,10 @@ 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;
@@ -78,7 +86,7 @@ private:
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;