diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-12-18 15:10:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-12-18 15:10:36 +0100 |
| commit | bba9cd814b189f6458dee4a109369a7d4ae0e3ce (patch) | |
| tree | 1cd7ad7f14329fee1cb96184a7da94b54c2fe83e /src/wx | |
| parent | 9ebbeae21efe950c4f18a9f959a8fe9f0be4e8f4 (diff) | |
Cleanup: remove unnecessary parameter to PlayerVideo::force().
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 3 | ||||
| -rw-r--r-- | src/wx/gl_video_view.cc | 3 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 3 |
3 files changed, 6 insertions, 3 deletions
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); |