X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=f450c8022de62e53f05540a3060a392b9799c05e;hb=fc1441eeaa3c0805c37809685ea7a3f5ca173666;hp=d8ffd2c6b8acc2c23e9abf3cf184c15172d7fe00;hpb=4d11fe7cea71b0564df9a21a3cc706509d12b0d1;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index d8ffd2c6b..f450c8022 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -32,24 +32,21 @@ 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 ();
+	void go () override;
 
-	float current_rate () const;
-	Frame frames_done () const;
-	bool finishing () const {
+	boost::optional<float> current_rate () const override;
+	Frame frames_done () const override;
+	bool finishing () const override {
 		return false;
 	}
 
@@ -64,25 +61,21 @@ private:
 			int audio_frame_rate,
 			int channels,
 			ExportFormat,
+			bool audio_stream_per_channel,
 			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;
+		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;
@@ -90,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