Merge branch 'master' into 12bit

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ed1a2ce4109293b3d932be8fabacb2bc4477878b..54cd3e77dc30014816f35b90457d0014ea045f16 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -53,7 +53,7 @@ using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using libdcp::Size;
 
-FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
+FilmViewer::FilmViewer (wxWindow* p)
        : wxPanel (p)
        , _panel (new wxPanel (this))
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
@@ -103,8 +103,8 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        _back_button->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::back_clicked,    this));
        _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::forward_clicked, this));
 
-       set_film (f);
-
+       set_film (shared_ptr<Film> ());
+       
        JobManager::instance()->ActiveJobsChanged.connect (
                bind (&FilmViewer::active_jobs_changed, this, _1)
                );
@@ -295,7 +295,7 @@ FilmViewer::process_video (shared_ptr<PlayerVideoFrame> pvf, Time t)
                return;
        }
        
-       _frame = pvf->image ();
+       _frame = pvf->image (PIX_FMT_RGB24);
        _got_frame = true;
 
        set_position_text (t);