Cleanup: remove unnecessary parameter to PlayerVideo::force().

7 files changed, 14 insertions, 8 deletions

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 6dc3a83d4..d4f0b4b47 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder (
 	}
 
 	_butler = std::make_shared<Butler>(
-		_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
+		_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
 		);
 }
 
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 705557f79..f9443b256 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -400,7 +400,7 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
 	/* All our output formats are video range at the moment */
 	auto image = video->image (
-		bind (&PlayerVideo::force, _1, _pixel_format),
+		bind (&PlayerVideo::force, _pixel_format),
 		VideoRange::VIDEO,
 		false
 		);
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 4cc536bb7..2f0616d48 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "content.h"
 #include "film.h"
 #include "image.h"
@@ -33,17 +34,19 @@ extern "C" {
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 using std::cout;
 using std::dynamic_pointer_cast;
+using std::function;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
 using boost::optional;
-using std::function;
 using dcp::Data;
 using dcp::raw_convert;
 
+
 PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
 	Crop crop,
@@ -285,7 +288,7 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 }
 
 AVPixelFormat
-PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
+PlayerVideo::force (AVPixelFormat force_to)
 {
 	return force_to;
 }
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 237d2e3fe..f2781c1a0 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -79,7 +79,7 @@ public:
 	std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
 	std::shared_ptr<const Image> raw_image () const;
 
-	static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
+	static AVPixelFormat force (AVPixelFormat);
 	static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
 	void add_metadata (xmlpp::Node* node) const;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ac12bea3f..d91a9db9c 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -68,6 +68,7 @@ using std::max;
 using std::shared_ptr;
 using std::string;
 using std::vector;
+using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -223,7 +224,7 @@ FilmViewer::recreate_butler ()
 		_player,
 		Config::instance()->audio_mapping(_audio_channels),
 		_audio_channels,
-		bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+		bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
 		VideoRange::FULL,
 		j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
 		true,
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 0a8235537..72efce0e4 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -60,6 +60,7 @@
 using std::cout;
 using std::shared_ptr;
 using std::string;
+using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -506,7 +507,7 @@ GLVideoView::draw ()
 void
 GLVideoView::set_image (shared_ptr<const PlayerVideo> pv)
 {
-	shared_ptr<const Image> video = _optimise_for_j2k ? pv->raw_image() : pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
+	shared_ptr<const Image> video = _optimise_for_j2k ? pv->raw_image() : pv->image(bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
 
 	/* Only the player's black frames should be aligned at this stage, so this should
 	 * almost always have no work to do.
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index f4ff9a4eb..7f816c31d 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -34,6 +34,7 @@
 using std::max;
 using std::shared_ptr;
 using std::string;
+using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -224,7 +225,7 @@ SimpleVideoView::update ()
 
 	_state_timer.set ("get image");
 
-	_image = player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
+	_image = player_video().first->image(bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
 
 	_state_timer.set ("ImageChanged");
 	_viewer->image_changed (player_video().first);