X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=9f54db58e027e9b651f830d098d41045c0e91775;hb=HEAD;hp=894d1d4bf1b3d0baf5c1218096e78e35ff0aac64;hpb=563fc75855b9649cf135cf137cc1b0c43ebc8286;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 894d1d4bf..9f54db58e 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,45 +18,52 @@
 
 */
 
+
 /** @file src/wx/film_editor.cc
  *  @brief FilmEditor class.
  */
 
-#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 "dcp_panel.h"
+#include "film_editor.h"
+#include "wx_util.h"
 #include "lib/content.h"
 #include "lib/dcp_content.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 <boost/foreach.hpp>
-#include <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::cout;
-using std::string;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
-FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
+FilmEditor::FilmEditor(wxWindow* parent, 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);
+	auto notebook = new wxNotebook(this, wxID_ANY);
+	s->Add(notebook, 1, wxEXPAND);
 
-	_content_panel = new ContentPanel (_main_notebook, _film, viewer);
-	_main_notebook->AddPage (_content_panel->window(), _("Content"), true);
-	_dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
-	_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
+	_content_panel = new ContentPanel(notebook, _film, viewer);
+	notebook->AddPage(_content_panel->window(), _("Content"), true);
+	_dcp_panel = new DCPPanel(notebook, _film, viewer);
+	notebook->AddPage(_dcp_panel->panel (), _("DCP"), false);
 
 	JobManager::instance()->ActiveJobsChanged.connect (
-		bind (&FilmEditor::active_jobs_changed, this, _2)
+		bind(&FilmEditor::active_jobs_changed, this, _2)
 		);
 
 	set_film (shared_ptr<Film> ());
@@ -69,9 +76,9 @@ FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
  *  @param p Property of the Film that has changed.
  */
 void
-FilmEditor::film_change (ChangeType type, Film::Property p)
+FilmEditor::film_change(ChangeType type, FilmProperty p)
 {
-	if (type != CHANGE_TYPE_DONE) {
+	if (type != ChangeType::DONE) {
 		return;
 	}
 
@@ -84,16 +91,17 @@ FilmEditor::film_change (ChangeType type, Film::Property p)
 	_content_panel->film_changed (p);
 	_dcp_panel->film_changed (p);
 
-	if (p == Film::CONTENT && !_film->content().empty ()) {
+	if (p == FilmProperty::CONTENT && !_film->content().empty()) {
 		/* Select newly-added content */
 		_content_panel->set_selection (_film->content().back ());
 	}
 }
 
+
 void
 FilmEditor::film_content_change (ChangeType type, int property)
 {
-	if (type != CHANGE_TYPE_DONE) {
+	if (type != ChangeType::DONE) {
 		return;
 	}
 
@@ -110,11 +118,12 @@ FilmEditor::film_content_change (ChangeType type, 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;
@@ -126,24 +135,18 @@ FilmEditor::set_film (shared_ptr<Film> film)
 	_dcp_panel->set_film (_film);
 
 	if (!_film) {
-		FileChanged ("");
 		return;
 	}
 
-	_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 ("");
-	}
+	_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 ());
+		_content_panel->set_selection (_film->content().front());
 	}
 }
 
+
 void
 FilmEditor::set_general_sensitivity (bool s)
 {
@@ -151,6 +154,7 @@ FilmEditor::set_general_sensitivity (bool s)
 	_dcp_panel->set_general_sensitivity (s);
 }
 
+
 void
 FilmEditor::active_jobs_changed (optional<string> j)
 {