X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=c6a4f1e74816cd8ec7c43bc5774677206e70adf2;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=1ac56bbfe1f0ca3af029b6840511124af242a630;hpb=67ff55886b1ee86d99c2ea27d10c73b85b0504b7;p=dcpomatic.git diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 1ac56bbfe..c6a4f1e74 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -26,8 +26,11 @@ #include "lib/butler.h" #include "lib/dcpomatic_log.h" #include "lib/image.h" +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include @@ -65,6 +68,8 @@ SimpleVideoView::paint () { _state_timer.set("paint-panel"); wxPaintDC dc (_panel); + auto scale = 1 / dpi_scale_factor (_panel); + dc.SetLogicalScale (scale, scale); auto const panel_size = _panel->GetSize (); @@ -222,7 +227,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(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); _state_timer.set ("ImageChanged"); _viewer->image_changed (player_video().first);