X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=944ff357256e140e7a98efa16a3008bb02288d83;hb=56cdff7fbb1f9c55f9ad3076fcb885e4005189ce;hp=7f9461d940fb4ba6f4035707fc1f930c214c62f9;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 7f9461d94..944ff3572 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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,54 +21,20 @@ * @brief A wx widget to edit a film's metadata, and perform various functions. */ -#include -#include -#include -#include -#include -#include -#include -#include #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 +#include +#include -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) @@ -89,7 +55,6 @@ FilmEditor::FilmEditor (wxWindow* parent) ); set_film (shared_ptr ()); - SetSizerAndFit (s); }