X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=ae0868f27f55f01bf2543e6307efda9639ace184;hp=5380cbd9bed582cd7716ade2096b7c5c34dc2065;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hpb=c6c1173589761734608d66cc3a8dff4e06b26147

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 5380cbd9b..ae0868f27 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,14 +22,14 @@
  *  @brief FilmEditor class.
  */
 
-#include "lib/film.h"
-#include "lib/job_manager.h"
-#include "lib/content.h"
-#include "lib/dcp_content.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "dcp_panel.h"
 #include "content_panel.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/content.h"
+#include "lib/dcp_content.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <boost/foreach.hpp>
@@ -39,9 +39,10 @@ using std::cout;
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::optional;
 
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -50,8 +51,8 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
 	s->Add (_main_notebook, 1);
 
 	_content_panel = new ContentPanel (_main_notebook, _film, viewer);
-	_main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
-	_dcp_panel = new DCPPanel (_main_notebook, _film);
+	_main_notebook->AddPage (_content_panel->window(), _("Content"), true);
+	_dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
 	_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 
 	JobManager::instance()->ActiveJobsChanged.connect (
@@ -68,8 +69,12 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
  *  @param p Property of the Film that has changed.
  */
 void
-FilmEditor::film_changed (Film::Property p)
+FilmEditor::film_change (ChangeType type, Film::Property p)
 {
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (!_film) {
@@ -86,8 +91,12 @@ FilmEditor::film_changed (Film::Property p)
 }
 
 void
-FilmEditor::film_content_changed (int property)
+FilmEditor::film_content_change (ChangeType type, int property)
 {
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (!_film) {
@@ -116,18 +125,21 @@ FilmEditor::set_film (shared_ptr<Film> film)
 	_content_panel->set_film (_film);
 	_dcp_panel->set_film (_film);
 
-	if (_film) {
-		_film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
-		_film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
+	if (!_film) {
+		FileChanged ("");
+		return;
 	}
 
-	if (_film && _film->directory()) {
+	_film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
+	_film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+
+	if (_film->directory()) {
 		FileChanged (_film->directory().get());
 	} else {
 		FileChanged ("");
 	}
 
-	if (!_film->content().empty ()) {
+	if (!_film->content().empty()) {
 		_content_panel->set_selection (_film->content().front ());
 	}
 }
@@ -142,5 +154,5 @@ FilmEditor::set_general_sensitivity (bool s)
 void
 FilmEditor::active_jobs_changed (optional<string> j)
 {
-	set_general_sensitivity (!j || *j == "analyse_audio");
+	set_general_sensitivity (!j);
 }