Move Eyes and ColourConversion into PlayerVideoFrame.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ce5eab00e1db8e8f0bd4bb7e707fe470e59bc7cb..ed1a2ce4109293b3d932be8fabacb2bc4477878b 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -34,6 +34,7 @@
 #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 "film_viewer.h"
@@ -136,7 +137,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
        }
        
        _player->disable_audio ();
-       _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5));
+       _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _3));
        _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
        calculate_sizes ();
@@ -288,13 +289,13 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, Time t)
+FilmViewer::process_video (shared_ptr<PlayerVideoFrame> pvf, Time t)
 {
-       if (eyes == EYES_RIGHT) {
+       if (pvf->eyes() == EYES_RIGHT) {
                return;
        }
        
-       _frame = image->image ();
+       _frame = pvf->image ();
        _got_frame = true;
 
        set_position_text (t);