X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=27c8d23b61710d4478c3a96008c52176bceeec66;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=9b648a8b970ed28c3fb031a72e70d9b18d8ef237;hpb=a978f3ac575f1af017002c861480d5203cf0a34e;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9b648a8b9..27c8d23b6 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -54,6 +54,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)
@@ -113,7 +114,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,6 +150,8 @@ 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));
 
@@ -316,11 +319,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 */
@@ -379,28 +382,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