diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-23 00:09:47 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:41:46 +0200 |
| commit | 67ff55886b1ee86d99c2ea27d10c73b85b0504b7 (patch) | |
| tree | 58f0a78ebb1e02f50c9e101b53c0402e3f688673 /src/wx/simple_video_view.cc | |
| parent | 571a29b441ce6fe4a1e35bbcbcf4ea6abc885c22 (diff) | |
Various alignment tidying/fixups.
Diffstat (limited to 'src/wx/simple_video_view.cc')
| -rw-r--r-- | src/wx/simple_video_view.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index e54c8390e..1ac56bbfe 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -72,6 +72,7 @@ SimpleVideoView::paint () if (!_image) { dc.Clear (); } else { + DCPOMATIC_ASSERT (_image->alignment() == Image::Alignment::COMPACT); out_size = _image->size(); wxImage frame (out_size.width, out_size.height, _image->data()[0], true); wxBitmap frame_bitmap (frame); @@ -188,7 +189,7 @@ void SimpleVideoView::update () { if (!player_video().first) { - set_image (shared_ptr<Image>()); + _image.reset (); refresh_panel (); return; } @@ -221,9 +222,7 @@ SimpleVideoView::update () _state_timer.set ("get image"); - set_image ( - player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true) - ); + _image = player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); _state_timer.set ("ImageChanged"); _viewer->image_changed (player_video().first); |