X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=2ec174260154158bc02c871ef6427cf21cc8200f;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=545eaf56ea610f13099c3e25784373b78a97dbe9;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 545eaf56e..2ec174260 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,57 +1,69 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @file src/wx/film_editor.cc
  *  @brief FilmEditor class.
  */
 
-#include "lib/film.h"
-#include "lib/job_manager.h"
+
+#include "content_panel.h"
+#include "dcp_panel.h"
+#include "film_editor.h"
+#include "wx_util.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 <wx/wx.h>
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
-#include <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::list;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-using std::cout;
-using boost::shared_ptr;
 
-/** @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);
+	auto s = new wxBoxSizer (wxVERTICAL);
 
 	_main_notebook = new wxNotebook (this, wxID_ANY);
 	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 (
-		bind (&FilmEditor::active_jobs_changed, this, _1)
+		bind(&FilmEditor::active_jobs_changed, this, _2)
 		);
 
 	set_film (shared_ptr<Film> ());
@@ -64,8 +76,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 != ChangeType::DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (!_film) {
@@ -75,15 +91,20 @@ FilmEditor::film_changed (Film::Property p)
 	_content_panel->film_changed (p);
 	_dcp_panel->film_changed (p);
 
-	if (p == Film::CONTENT && !_film->content().empty ()) {
+	if (p == Film::Property::CONTENT && !_film->content().empty()) {
 		/* Select newly-added content */
 		_content_panel->set_selection (_film->content().back ());
 	}
 }
 
+
 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) {
@@ -97,11 +118,12 @@ FilmEditor::film_content_changed (int property)
 	_dcp_panel->film_content_changed (property);
 }
 
+
 /** Sets the Film that we are editing */
 void
 FilmEditor::set_film (shared_ptr<Film> film)
 {
-	set_general_sensitivity (film != 0);
+	set_general_sensitivity (film != nullptr);
 
 	if (_film == film) {
 		return;
@@ -112,22 +134,19 @@ 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) {
+		return;
 	}
 
-	if (_film) {
-		FileChanged (_film->directory ());
-	} else {
-		FileChanged ("");
-	}
+	_film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
+	_film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
 
-	if (!_film->content().empty ()) {
-		_content_panel->set_selection (_film->content().front ());
+	if (!_film->content().empty()) {
+		_content_panel->set_selection (_film->content().front());
 	}
 }
 
+
 void
 FilmEditor::set_general_sensitivity (bool s)
 {
@@ -135,8 +154,17 @@ FilmEditor::set_general_sensitivity (bool s)
 	_dcp_panel->set_general_sensitivity (s);
 }
 
+
 void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::active_jobs_changed (optional<string> j)
 {
-	set_general_sensitivity (!a);
+	set_general_sensitivity (!j);
 }
+
+
+void
+FilmEditor::first_shown ()
+{
+	_content_panel->first_shown ();
+}
+