X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=b67c9612dbb765e4eeaa67070f1e0693712e89d3;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=82fae2e9bdbb69f732754d2fe9e1c4feba1e58de;hpb=5dce250808e2371fdbd3e2f21511e789454b788f;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 82fae2e9b..b67c9612d 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -34,7 +34,9 @@
 #include <iostream>
 
 using std::cout;
+using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 /** @param f Film to edit */
 FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
@@ -49,7 +51,7 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
 	_main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
 	_dcp_panel = new DCPPanel (_main_notebook, _film);
 	_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
-	
+
 	JobManager::instance()->ActiveJobsChanged.connect (
 		bind (&FilmEditor::active_jobs_changed, this, _1)
 		);
@@ -67,7 +69,7 @@ void
 FilmEditor::film_changed (Film::Property p)
 {
 	ensure_ui_thread ();
-	
+
 	if (!_film) {
 		return;
 	}
@@ -85,7 +87,7 @@ void
 FilmEditor::film_content_changed (int property)
 {
 	ensure_ui_thread ();
-	
+
 	if (!_film) {
 		/* We call this method ourselves (as well as using it as a signal handler)
 		   so _film can be 0.
@@ -99,15 +101,15 @@ FilmEditor::film_content_changed (int property)
 
 /** Sets the Film that we are editing */
 void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> film)
 {
-	set_general_sensitivity (f != 0);
+	set_general_sensitivity (film != 0);
 
-	if (_film == f) {
+	if (_film == film) {
 		return;
 	}
-	
-	_film = f;
+
+	_film = film;
 
 	_content_panel->set_film (_film);
 	_dcp_panel->set_film (_film);
@@ -136,7 +138,7 @@ FilmEditor::set_general_sensitivity (bool s)
 }
 
 void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::active_jobs_changed (optional<string> j)
 {
-	set_general_sensitivity (!a);
+	set_general_sensitivity (!j || *j == "analyse_audio");
 }