X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=a1cc5dfc4bd37dd1751523895291005069975909;hb=9c9890b9ff89af710db21145c03a09993c629e3e;hp=ef5c78f24ae2b628751b493fb9a2f618c7ec047a;hpb=cf8bbea2de38c4e9ac140f55b27311b7b6dcd814;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ef5c78f24..a1cc5dfc4 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -21,16 +21,11 @@
  *  @brief A wx widget to view a preview of a Film.
  */
 
-#include <iostream>
-#include <iomanip>
-#include <wx/tglbtn.h>
-#include <dcp/exceptions.h>
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
 #include "lib/image.h"
-#include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
@@ -39,8 +34,13 @@
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "lib/timer.h"
+#include "lib/log.h"
 #include "film_viewer.h"
 #include "wx_util.h"
+#include <dcp/exceptions.h>
+#include <wx/tglbtn.h>
+#include <iostream>
+#include <iomanip>
 
 using std::string;
 using std::pair;
@@ -50,6 +50,7 @@ using std::cout;
 using std::list;
 using std::bad_alloc;
 using std::make_pair;
+using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
@@ -151,6 +152,8 @@ FilmViewer::set_film (shared_ptr<Film> f)
 
 	calculate_sizes ();
 	get (_position, _last_get_accurate);
+
+	setup_sensitivity ();
 }
 
 void
@@ -167,11 +170,23 @@ FilmViewer::get (DCPTime p, bool accurate)
 		return;
 	}
 
-	list<shared_ptr<PlayerVideo> > pvf = _player->get_video (p, accurate);
+	list<shared_ptr<PlayerVideo> > pvf;
+	try {
+		pvf = _player->get_video (p, accurate);
+	} catch (exception& e) {
+		error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
+	}
+	
 	if (!pvf.empty ()) {
 		try {
-			_frame = pvf.front()->image (true);
-			_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
+			_frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+
+			dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+			if (pvf.front()->colour_conversion()) {
+				yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
+			}
+			
+			_frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
 			_position = pvf.front()->time ();
 			_inter_position = pvf.front()->inter_position ();
 			_inter_size = pvf.front()->inter_size ();