Use libdcp's warnings.h

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 767676fff100c76260fbd6ac083f446dd9d94e16..47fb469707fdeab4255663ba199209f631864d52 100644 (file)
--- 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,36 +18,41 @@
 
 */
 
+
 /** @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 <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::cout;
-using std::string;
 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
 
+
 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);
@@ -58,7 +63,7 @@ FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        _main_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> ());
@@ -92,6 +97,7 @@ FilmEditor::film_change (ChangeType type, Film::Property p)
        }
 }
 
+
 void
 FilmEditor::film_content_change (ChangeType type, int property)
 {
@@ -112,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;
@@ -132,8 +139,8 @@ FilmEditor::set_film (shared_ptr<Film> film)
                return;
        }
 
-       _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
-       _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+       _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());
@@ -142,10 +149,11 @@ FilmEditor::set_film (shared_ptr<Film> film)
        }
 
        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)
 {
@@ -153,6 +161,7 @@ FilmEditor::set_general_sensitivity (bool s)
        _dcp_panel->set_general_sensitivity (s);
 }
 
+
 void
 FilmEditor::active_jobs_changed (optional<string> j)
 {