Merge master.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 37a8c880847391eb68d29bdbe7063c5940c4a7cc..881317f3aa74cfd94128651a909a4c5ec79a5bdd 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -45,6 +45,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
+#include "lib/safe_stringstream.h"
 #include "timecode.h"
 #include "wx_util.h"
 #include "film_editor.h"
@@ -58,7 +59,6 @@
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using std::pair;
 using std::fixed;
 using std::setprecision;
@@ -71,7 +71,7 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 /** @param f Film to edit */
-FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
+FilmEditor::FilmEditor (wxWindow* parent)
        : wxPanel (parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -84,13 +84,11 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
        _dcp_panel = new DCPPanel (_main_notebook, _film);
        _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
        
-       set_film (f);
-
        JobManager::instance()->ActiveJobsChanged.connect (
                bind (&FilmEditor::active_jobs_changed, this, _1)
                );
 
-       SetSizerAndFit (s);
+       set_film (shared_ptr<Film> ());
 }
 
 
@@ -109,7 +107,6 @@ FilmEditor::film_changed (Film::Property p)
 
        _content_panel->film_changed (p);
        _dcp_panel->film_changed (p);
-
 }
 
 void
@@ -171,4 +168,3 @@ FilmEditor::active_jobs_changed (bool a)
 {
        set_general_sensitivity (!a);
 }
-