diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-26 19:26:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-26 19:26:41 +0100 |
| commit | dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d (patch) | |
| tree | 0d89f77fcad1b9bd0629587f367b79384bb0fbb3 /src/wx | |
| parent | 14e4bc18e65378332604016bd6239861a083d5bf (diff) | |
Rest of src/lib/*.h tidying.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 1 | ||||
| -rw-r--r-- | src/wx/screen_dialog.h | 4 | ||||
| -rw-r--r-- | src/wx/timeline.cc | 14 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 159239345..a1d412b62 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -31,6 +31,7 @@ #include "lib/job_manager.h" #include "lib/exceptions.h" #include "lib/dcp_content.h" +#include "lib/ffmpeg_content.h" #include <wx/wx.h> #include <wx/dirdlg.h> diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index cf8d3da18..c88b3bb31 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -17,10 +17,10 @@ */ +#include "table_dialog.h" +#include <dcp/certificate.h> #include <wx/wx.h> #include <boost/shared_ptr.hpp> -#include <dcp/certificate.h> -#include "table_dialog.h" class Progress; diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 4f0eef0e1..9a9dfc26d 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -17,12 +17,6 @@ */ -#include <list> -#include <wx/graphics.h> -#include <boost/weak_ptr.hpp> -#include "lib/film.h" -#include "lib/playlist.h" -#include "lib/image_content.h" #include "film_editor.h" #include "timeline.h" #include "timeline_time_axis_view.h" @@ -31,6 +25,14 @@ #include "timeline_subtitle_content_view.h" #include "content_panel.h" #include "wx_util.h" +#include "lib/film.h" +#include "lib/playlist.h" +#include "lib/image_content.h" +#include "lib/audio_content.h" +#include "lib/subtitle_content.h" +#include <wx/graphics.h> +#include <boost/weak_ptr.hpp> +#include <list> using std::list; using std::cout; |
