More enum class additions.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index cbdbe0f36626592dbddbcdacd6bc8bb3c1ab44fd..47a6358cca9677e3f35d9cf3a48ac7caaef80b73 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,26 +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
 
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -50,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 (
@@ -70,7 +73,7 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
 void
 FilmEditor::film_change (ChangeType type, Film::Property p)
 {
-       if (type != CHANGE_TYPE_DONE) {
+       if (type != ChangeType::DONE) {
                return;
        }
 
@@ -92,7 +95,7 @@ FilmEditor::film_change (ChangeType type, Film::Property p)
 void
 FilmEditor::film_content_change (ChangeType type, int property)
 {
-       if (type != CHANGE_TYPE_DONE) {
+       if (type != ChangeType::DONE) {
                return;
        }
 
@@ -124,18 +127,21 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _content_panel->set_film (_film);
        _dcp_panel->set_film (_film);
 
-       if (_film) {
-               _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
-               _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+       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 ());
        }
 }
@@ -150,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 ();
+}
+