X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=2d5c6af8703cfd3f8331f40f4a6f7989df40ed21;hb=37d2bf172e9061f24c874d5416bd3c8f9719c823;hp=df2dcfcc866f5a7535c697274244dd4a3a02d6fa;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index df2dcfcc8..2d5c6af87 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -21,35 +21,32 @@
 #ifndef DCPOMATIC_FFMPEG_ENCODER_H
 #define DCPOMATIC_FFMPEG_ENCODER_H
 
+#include "audio_mapping.h"
+#include "butler.h"
 #include "encoder.h"
 #include "event_history.h"
-#include "audio_mapping.h"
 #include "ffmpeg_file_encoder.h"
 
-class Butler;
 
 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;
 
-	boost::optional<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,24 @@ 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;
+	AudioMapping stereo_map() const;
+	AudioMapping many_channel_map() const;
+
 	int _output_audio_channels;
 
 	mutable boost::mutex _mutex;
@@ -90,7 +86,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;
+
+	Butler _butler;
 };
 
 #endif