diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-25 22:16:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-26 21:51:18 +0200 |
| commit | df9b4676aba8b941f124b174393988cad21677e1 (patch) | |
| tree | 21658068cf5b2a74e23339e013398b20b327f886 /src/wx | |
| parent | e444fbd0d7c8a32e9f50adc19d0d49ae7c489a11 (diff) | |
Remove functors for choosing pixel format output from make_image().
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 2 | ||||
| -rw-r--r-- | src/wx/gl_video_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index ba0651b14..b97ef7bfb 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -247,7 +247,7 @@ FilmViewer::create_butler() *_player, Config::instance()->audio_mapping(_audio_channels), _audio_channels, - boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), + AV_PIX_FMT_RGB24, VideoRange::FULL, (opengl && _optimisation != Optimisation::NONE) ? Image::Alignment::COMPACT : Image::Alignment::PADDED, true, diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 9e53248f6..f9096be82 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -645,7 +645,7 @@ GLVideoView::set_image(shared_ptr<const PlayerVideo> pv) video = pv->raw_image(); break; case Optimisation::NONE: - video = pv->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + video = pv->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true); break; } diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index c003be7b6..9038920ce 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -245,14 +245,14 @@ SimpleVideoView::update () * The content's specified colour conversion indicates the colourspace * which the content is in (according to the user). * - * PlayerVideo::image (bound to PlayerVideo::force) will take the source - * image and convert it (from whatever the user has said it is) to RGB. + * PlayerVideo::image will take the source image and convert it + * (from whatever the user has said it is) to RGB. */ _state_timer.set ("get image"); auto const pv = player_video(); - _image = pv.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + _image = pv.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true); if (pv.first->colour_conversion() && pv.first->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_xyz(), 1e-6)) { _image = Image::ensure_alignment(_rec2020_filter_graph.get(_image->size(), _image->pixel_format())->process(_image).front(), Image::Alignment::COMPACT); } |