X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=cd138e2393bff7d581584618d3f419d243fe0507;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=358e4268c37f13407562895c1261d831dd02bfb7;hpb=2b72040260c8b38c8986dc1601e36053115b4914;p=dcpomatic.git diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 358e4268c..cd138e239 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -75,8 +75,14 @@ SimpleVideoView::paint () dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2)); } +#ifdef DCPOMATIC_OSX auto appearance = wxSystemSettings::GetAppearance(); - auto const pad_colour = (_viewer->pad_black() || appearance.IsDark()) ? wxColour(0, 0, 0) : wxColour(240, 240, 240); + auto dark = appearance.IsDark(); +#else + auto dark = false; +#endif + + auto const pad_colour = (_viewer->pad_black() || dark) ? wxColour(0, 0, 0) : wxColour(240, 240, 240); if (out_size.width < panel_size.GetWidth()) { wxPen p (pad_colour); @@ -215,7 +221,7 @@ SimpleVideoView::update () _state_timer.set ("get image"); set_image ( - player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true) + player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true) ); _state_timer.set ("ImageChanged");