X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;fp=src%2Fwx%2Ffilm_viewer.cc;h=c848fe09b6ffa5a3f99d52f17090e837bc8e9ce3;hp=e517c9ccaf55c2cc79c293b7a8211bbc3453271a;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e517c9cca..c848fe09b 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -34,10 +34,10 @@ #include "lib/examine_content_job.h" #include "lib/filter.h" #include "lib/player.h" +#include "lib/player_video_frame.h" #include "lib/video_content.h" #include "lib/video_decoder.h" #include "lib/timer.h" -#include "lib/dcp_video.h" #include "film_viewer.h" #include "wx_util.h" @@ -150,9 +150,9 @@ FilmViewer::get (DCPTime p, bool accurate) return; } - list > dcp_video = _player->get_video (p, accurate); - if (!dcp_video.empty ()) { - _frame = dcp_video.front()->image (PIX_FMT_BGRA, true); + list > pvf = _player->get_video (p, accurate); + if (!pvf.empty ()) { + _frame = pvf.front()->image (); _frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false); } else { _frame.reset ();