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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index f450c8022..2d5c6af87 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -21,12 +21,12 @@
 #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
 {
@@ -73,9 +73,12 @@ private:
 		void audio (std::shared_ptr<AudioBuffers>);
 
 	private:
-		std::map<Eyes, std::shared_ptr<FFmpegFileEncoder> > _encoders;
+		std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
 	};
 
+	AudioMapping stereo_map() const;
+	AudioMapping many_channel_map() const;
+
 	int _output_audio_channels;
 
 	mutable boost::mutex _mutex;
@@ -89,7 +92,7 @@ private:
 	bool _audio_stream_per_channel;
 	int _x264_crf;
 
-	std::shared_ptr<Butler> _butler;
+	Butler _butler;
 };
 
 #endif