X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=3e6dddb9261e41b13b1494dbc7024468a99061e2;hb=5f2a57d1c21c3e8067dfd1f68505b1bf96e1d7c7;hp=37a8c880847391eb68d29bdbe7063c5940c4a7cc;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 37a8c8808..3e6dddb92 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -21,57 +21,23 @@
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
  */
 
-#include <iostream>
-#include <iomanip>
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include <wx/listctrl.h>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 #include "lib/film.h"
-#include "lib/transcode_job.h"
-#include "lib/exceptions.h"
 #include "lib/job_manager.h"
-#include "lib/filter.h"
-#include "lib/ratio.h"
-#include "lib/config.h"
-#include "lib/image_content.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/sndfile_content.h"
-#include "lib/dcp_content_type.h"
-#include "lib/scaler.h"
-#include "lib/playlist.h"
 #include "lib/content.h"
-#include "lib/content_factory.h"
 #include "lib/dcp_content.h"
-#include "timecode.h"
 #include "wx_util.h"
 #include "film_editor.h"
-#include "timeline_dialog.h"
-#include "timing_panel.h"
-#include "subtitle_panel.h"
-#include "audio_panel.h"
-#include "video_panel.h"
-#include "content_panel.h"
 #include "dcp_panel.h"
+#include "content_panel.h"
+#include <wx/wx.h>
+#include <wx/notebook.h>
+#include <iostream>
 
-using std::string;
 using std::cout;
-using std::stringstream;
-using std::pair;
-using std::fixed;
-using std::setprecision;
-using std::list;
-using std::vector;
-using std::max;
 using boost::shared_ptr;
-using boost::weak_ptr;
-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,12 +50,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)
 		);
 
+	set_film (shared_ptr<Film> ());
 	SetSizerAndFit (s);
 }
 
@@ -109,7 +74,6 @@ FilmEditor::film_changed (Film::Property p)
 
 	_content_panel->film_changed (p);
 	_dcp_panel->film_changed (p);
-
 }
 
 void
@@ -171,4 +135,3 @@ FilmEditor::active_jobs_changed (bool a)
 {
 	set_general_sensitivity (!a);
 }
-