X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=e33a3c118dc92eedf9f63bb1b79c88c88d1834d8;hb=9facdf75a2776319fc5826cfa3dd85340f3c8879;hp=21d4ae1fe1938e1da5d45de9e4b3e9a8bb0d07a7;hpb=88a1ed7f07219b5cbca3221ab25fe3e77d50989e;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 21d4ae1fe..e33a3c118 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -26,7 +26,6 @@
 #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"
@@ -145,10 +144,14 @@ FilmViewer::set_film (shared_ptr<Film> f)
 		_film.reset ();
 		return;
 	}
+
+	/* Always burn in subtitles, even if we are set not to, otherwise we won't see them
+	   in the preview.
+	*/
+	_player->set_burn_subtitles (true);
 	
 	_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
-	_player->set_approximate_size ();
 	_player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
 	calculate_sizes ();
@@ -181,7 +184,13 @@ FilmViewer::get (DCPTime p, bool accurate)
 	if (!pvf.empty ()) {
 		try {
 			_frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
-			_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
+
+			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 ();
@@ -315,13 +324,6 @@ FilmViewer::calculate_sizes ()
 	_out_size.width = max (64, _out_size.width);
 	_out_size.height = max (64, _out_size.height);
 
-	/* The player will round its image size down to the next lowest 4 pixels
-	   to speed up its scale, so do similar here to avoid black borders
-	   around things.  This is a bit of a hack.
-	*/
-	_out_size.width &= ~3;
-	_out_size.height &= ~3;
-
 	_player->set_video_container_size (_out_size);
 }
 
@@ -357,16 +359,7 @@ FilmViewer::set_position_text ()
 	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
 	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (_position.seconds() * fps)) + 1));
-	
-	double w = _position.seconds ();
-	int const h = (w / 3600);
-	w -= h * 3600;
-	int const m = (w / 60);
-	w -= m * 60;
-	int const s = floor (w);
-	w -= s;
-	int const f = rint (w * fps);
-	_timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f));
+	_timecode->SetLabel (time_to_timecode (_position, fps));
 }
 
 void