X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=bbfafa8c5595900a15df507036cfa88ec9c6e454;hb=1420c529d7e196f96ddf9580efdc09fa01c55d58;hp=7f9461d940fb4ba6f4035707fc1f930c214c62f9;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 7f9461d94..bbfafa8c5 100644
--- 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
@@ -17,61 +17,27 @@
 
 */
 
-/** @file src/film_editor.cc
- *  @brief A wx widget to edit a film's metadata, and perform various functions.
+/** @file src/wx/film_editor.cc
+ *  @brief FilmEditor class.
  */
 
-#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 (wxWindow* parent)
+FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
 	: wxPanel (parent)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -79,7 +45,7 @@ FilmEditor::FilmEditor (wxWindow* parent)
 	_main_notebook = new wxNotebook (this, wxID_ANY);
 	s->Add (_main_notebook, 1);
 
-	_content_panel = new ContentPanel (_main_notebook, _film);
+	_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 (_dcp_panel->panel (), _("DCP"), false);
@@ -89,7 +55,6 @@ FilmEditor::FilmEditor (wxWindow* parent)
 		);
 
 	set_film (shared_ptr<Film> ());
-	
 	SetSizerAndFit (s);
 }