X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=5ca147b747b932be49c035c51b6e9477bffac12e;hb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057;hp=1badc0282fc2258edb1c77f22867147e96fefc74;hpb=2da067ce01a04964dd5d739ea695504517877507;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 1badc0282..5ca147b74 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -37,6 +37,9 @@
 #include "lib/log.h"
 #include "film_viewer.h"
 #include "wx_util.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include <dcp/exceptions.h>
 #include <wx/tglbtn.h>
 #include <iostream>
@@ -54,6 +57,7 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
+using boost::optional;
 using dcp::Size;
 
 FilmViewer::FilmViewer (wxWindow* p)
@@ -66,6 +70,8 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
 	, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
 	, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
+	, _coalesce_player_changes (false)
+	, _pending_player_change (false)
 	, _last_get_accurate (true)
 {
 #ifndef __WXOSX__
@@ -113,7 +119,7 @@ FilmViewer::FilmViewer (wxWindow* p)
 	set_film (shared_ptr<Film> ());
 
 	JobManager::instance()->ActiveJobsChanged.connect (
-		bind (&FilmViewer::active_jobs_changed, this, _1)
+		bind (&FilmViewer::active_jobs_changed, this, _2)
 		);
 
 	setup_sensitivity ();
@@ -149,13 +155,15 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	   in the preview.
 	*/
 	_player->set_always_burn_subtitles (true);
+	_player->set_ignore_audio ();
+	_player->set_play_referenced ();
 
 	_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
 	_player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
 	calculate_sizes ();
-	get (_position, _last_get_accurate);
+	refresh ();
 
 	setup_sensitivity ();
 }
@@ -183,14 +191,19 @@ FilmViewer::get (DCPTime p, bool accurate)
 
 	if (!pvf.empty ()) {
 		try {
-			_frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+			/* XXX: this could now give us a 48-bit image, which is a bit wasteful,
+			   or a XYZ image, which the code below will currently rely on FFmpeg
+			   to colourspace-convert.
+			*/
+			_frame = pvf.front()->image (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+			ImageChanged (pvf.front ());
 
 			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);
+			_frame = _frame->scale (_frame->size(), yuv_to_rgb, AV_PIX_FMT_RGB24, false);
 			_position = pvf.front()->time ();
 			_inter_position = pvf.front()->inter_position ();
 			_inter_size = pvf.front()->inter_size ();
@@ -295,7 +308,7 @@ FilmViewer::panel_sized (wxSizeEvent& ev)
 	_panel_size.height = ev.GetSize().GetHeight();
 
 	calculate_sizes ();
-	get (_position, _last_get_accurate);
+	refresh ();
 	update_position_label ();
 	update_position_slider ();
 }
@@ -315,11 +328,11 @@ FilmViewer::calculate_sizes ()
 	if (panel_ratio < film_ratio) {
 		/* panel is less widscreen than the film; clamp width */
 		_out_size.width = _panel_size.width;
-		_out_size.height = rint (_out_size.width / film_ratio);
+		_out_size.height = lrintf (_out_size.width / film_ratio);
 	} else {
 		/* panel is more widescreen than the film; clamp height */
 		_out_size.height = _panel_size.height;
-		_out_size.width = rint (_out_size.height * film_ratio);
+		_out_size.width = lrintf (_out_size.height * film_ratio);
 	}
 
 	/* Catch silly values */
@@ -378,28 +391,17 @@ FilmViewer::update_position_label ()
 
 	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));
+	_frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1));
 	_timecode->SetLabel (time_to_timecode (_position, fps));
 }
 
 void
-FilmViewer::active_jobs_changed (bool a)
+FilmViewer::active_jobs_changed (optional<string> j)
 {
-	if (a) {
-		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-		list<shared_ptr<Job> >::iterator i = jobs.begin ();
-		while (i != jobs.end() && boost::dynamic_pointer_cast<ExamineContentJob> (*i) == 0) {
-			++i;
-		}
-
-		if (i == jobs.end() || (*i)->finished()) {
-			/* no examine content job running, so we're ok to use the viewer */
-			a = false;
-		}
-	}
-
-	_slider->Enable (!a);
-	_play_button->Enable (!a);
+	/* examine content is the only job which stops the viewer working */
+	bool const a = !j || *j != "examine_content";
+	_slider->Enable (a);
+	_play_button->Enable (a);
 }
 
 void
@@ -435,8 +437,13 @@ FilmViewer::player_changed (bool frequent)
 		return;
 	}
 
+	if (_coalesce_player_changes) {
+		_pending_player_change = true;
+		return;
+	}
+
 	calculate_sizes ();
-	get (_position, _last_get_accurate);
+	refresh ();
 	update_position_label ();
 	update_position_slider ();
 }
@@ -462,3 +469,33 @@ FilmViewer::film_changed (Film::Property p)
 		setup_sensitivity ();
 	}
 }
+
+/** Re-get the current frame */
+void
+FilmViewer::refresh ()
+{
+	get (_position, _last_get_accurate);
+}
+
+void
+FilmViewer::set_position (DCPTime p)
+{
+	_position = p;
+	get (_position, true);
+	update_position_label ();
+	update_position_slider ();
+}
+
+void
+FilmViewer::set_coalesce_player_changes (bool c)
+{
+	_coalesce_player_changes = c;
+
+	if (c) {
+		_pending_player_change = false;
+	} else {
+		if (_pending_player_change) {
+			player_changed (false);
+		}
+	}
+}