X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=5a5cc4912f8296e004f97f84f3108f4525c4ab5d;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=cbd5ba15d4f01839349d8759173f9e14ec9e1aa0;hpb=7245e46453a82886739a45bd78fcdf9e8401367c;p=dcpomatic.git

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index cbd5ba15d..5a5cc4912 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -57,7 +57,7 @@ using namespace boost::placeholders;
 
 /** @param pixel_format Pixel format functor that will be used when calling ::image on PlayerVideos coming out of this
  *  butler.  This will be used (where possible) to prepare the PlayerVideos so that calling image() on them is quick.
- *  @param aligned Same as above for the `aligned' flag.
+ *  @param alignment Same as above for the `alignment' value.
  *  @param fast Same as above for the `fast' flag.
  */
 Butler::Butler (
@@ -67,8 +67,9 @@ Butler::Butler (
 	int audio_channels,
 	function<AVPixelFormat (AVPixelFormat)> pixel_format,
 	VideoRange video_range,
-	bool aligned,
-	bool fast
+	Image::Alignment alignment,
+	bool fast,
+	bool prepare_only_proxy
 	)
 	: _film (film)
 	, _player (player)
@@ -83,8 +84,9 @@ Butler::Butler (
 	, _disable_audio (false)
 	, _pixel_format (pixel_format)
 	, _video_range (video_range)
-	, _aligned (aligned)
+	, _alignment (alignment)
 	, _fast (fast)
+	, _prepare_only_proxy (prepare_only_proxy)
 {
 	_player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
 	_player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2, _3));
@@ -323,7 +325,7 @@ try
 	/* If the weak_ptr cannot be locked the video obviously no longer requires any work */
 	if (video) {
 		LOG_TIMING("start-prepare in %1", thread_id());
-		video->prepare (_pixel_format, _video_range, _aligned, _fast, _prepare_only_proxy);
+		video->prepare (_pixel_format, _video_range, _alignment, _fast, _prepare_only_proxy);
 		LOG_TIMING("finish-prepare in %1", thread_id());
 	}
 }