Hand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow even

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 1ce4695d6bf83c2e00c09df358667e5551374da1..944ff357256e140e7a98efa16a3008bb02288d83 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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 "lib/safe_stringstream.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::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);
 }