summaryrefslogtreecommitdiff
path: root/src/wx/film_viewer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-09-23 00:09:47 +0200
committerCarl Hetherington <cth@carlh.net>2021-09-27 13:41:46 +0200
commit67ff55886b1ee86d99c2ea27d10c73b85b0504b7 (patch)
tree58f0a78ebb1e02f50c9e101b53c0402e3f688673 /src/wx/film_viewer.cc
parent571a29b441ce6fe4a1e35bbcbcf4ea6abc885c22 (diff)
Various alignment tidying/fixups.
Diffstat (limited to 'src/wx/film_viewer.cc')
-rw-r--r--src/wx/film_viewer.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5609ebf86..0131aa294 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -208,6 +208,8 @@ FilmViewer::recreate_butler ()
return;
}
+ auto const j2k_gl_optimised = dynamic_pointer_cast<GLVideoView>(_video_view) && _optimise_for_j2k;
+
_butler = std::make_shared<Butler>(
_film,
_player,
@@ -215,9 +217,9 @@ FilmViewer::recreate_butler ()
_audio_channels,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
VideoRange::FULL,
- _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
+ j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
true,
- dynamic_pointer_cast<GLVideoView>(_video_view) && _optimise_for_j2k
+ j2k_gl_optimised
);
if (!Config::instance()->sound() && !_audio.isStreamOpen()) {