X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=df2dcfcc866f5a7535c697274244dd4a3a02d6fa;hp=5356c5ce2fd8aae6786493b10c4052e59fab43a8;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=597dda0151eaa8a0a7635be7a757a5f65405c40b

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5356c5ce2..df2dcfcc8 100644
--- 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;
@@ -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;