X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=47a6358cca9677e3f35d9cf3a48ac7caaef80b73;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=a5e1e82e9b5ed747d4847d7e52bd2550cee1886c;hpb=96858c88f15ad9deb260da295b2af3847b9b8e15;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a5e1e82e9..47a6358cc 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,27 +22,29 @@
  *  @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>
 #include <iostream>
 
 using std::cout;
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -51,8 +53,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 (
@@ -69,19 +71,18 @@ 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 != ChangeType::DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (!_film) {
 		return;
 	}
 
-	list<string> notes = _film->fix_conflicting_settings ();
-	BOOST_FOREACH (string i, notes) {
-		message_dialog (this, std_to_wx (i));
-	}
-
 	_content_panel->film_changed (p);
 	_dcp_panel->film_changed (p);
 
@@ -92,8 +93,12 @@ FilmEditor::film_changed (Film::Property p)
 }
 
 void
-FilmEditor::film_content_changed (int property)
+FilmEditor::film_content_change (ChangeType type, int property)
 {
+	if (type != ChangeType::DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (!_film) {
@@ -122,18 +127,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) {
-		FileChanged (_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 ());
 	}
 }
@@ -148,5 +156,13 @@ 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);
 }
+
+
+void
+FilmEditor::first_shown ()
+{
+	_content_panel->first_shown ();
+}
+