Try a draggable splitter in the LHS.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index cbdbe0f36626592dbddbcdacd6bc8bb3c1ab44fd..59b44cd8c0e3ab53949352a6ac312fb672b1ed2c 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,14 +22,14 @@
  *  @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>
@@ -39,9 +39,10 @@ using std::cout;
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::optional;
 
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -50,7 +51,7 @@ 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);
+       _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
        _dcp_panel = new DCPPanel (_main_notebook, _film);
        _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 
@@ -150,5 +151,5 @@ 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);
 }