#include trimming.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 95d0d22a57b08cd57b5a0f70a107a05cae51c1d7..e67703b22fe34a69b544a34b660c74f693e39ca8 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -45,6 +45,7 @@
 #include "wx/servers_list_dialog.h"
 #include "wx/hints_dialog.h"
 #include "wx/update_dialog.h"
+#include "wx/content_panel.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index b3e78397dd42285e7f92db2b5a605a45777fee43..82604763c8e690b8e3c884703617794b2e475b6f 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -29,7 +29,7 @@
 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "gain_calculator_dialog.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::cout;

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index f0962cc24c07b4a7ae3d0fbe3da5aee0894dfca8..7ea17c15cf15c3f9de5929116737163dbf1c18e0 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -19,7 +19,7 @@
 
 #include <wx/notebook.h>
 #include "content_sub_panel.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using boost::shared_ptr;
 

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c80a2a16cd5706510a649ad7ad5db603d83afe99..d037ccd50628c75100e3d1a0d05f4701ee425056 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -54,6 +54,7 @@
 #include "subtitle_panel.h"
 #include "audio_panel.h"
 #include "video_panel.h"
+#include "content_panel.h"
 
 using std::string;
 using std::cout;

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index aad2ad9f7faf5c886700382ca696cc52ed5e6015..12a314abb46b83d5f08af5428d63d7deafd69ab1 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -22,23 +22,14 @@
  */
 
 #include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-#include <wx/collpane.h>
 #include <boost/signals2.hpp>
 #include "lib/film.h"
-#include "content_menu.h"
-#include "content_panel.h"
 
 class wxNotebook;
-class wxListCtrl;
-class wxListEvent;
+class wxSpinCtrl;
 class Film;
-class TimelineDialog;
 class Ratio;
-class Timecode;
-class FilmEditorPanel;
-class SubtitleContent;
+class ContentPanel;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 9025e5ddc4cb530a39cca106f6ca98ebdf9dff42..fecc85106f6f889d5a1bd725ac10978022bae7ac 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -29,6 +29,7 @@
 #include "film_editor.h"
 #include "wx_util.h"
 #include "subtitle_view.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index d728bd47c11349b5dea1ed079e0b6cefb3c397d3..1096a435aa5b7386e28ef1419e46e90621a342b9 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -25,6 +25,7 @@
 #include "lib/image_content.h"
 #include "film_editor.h"
 #include "timeline.h"
+#include "content_panel.h"
 #include "wx_util.h"
 
 using std::list;

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 2f7ade7657fb13bad1ab208867af4996b5142537..8ac90b8def6994d0e3f49e566d0f963c77c74de9 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -23,6 +23,7 @@
 #include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
+#include "content_panel.h"
 
 using std::list;
 using std::cout;

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 4345e71362e4c2964fea60abbd7ae975e35587e7..021ab6ab08405ecd646286937cd948ac82096d97 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -23,7 +23,7 @@
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "timecode.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::cout;
 using std::string;

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index facd0f3d48fcd8d7d38b9bf6c5c12a56b258100a..f00edd8fff0f69c3168911694a22b906581fd567 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -28,9 +28,9 @@
 #include "filter_dialog.h"
 #include "video_panel.h"
 #include "wx_util.h"
-#include "film_editor.h"
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;