Make sure wxWidgets headers are included before any Windows ones.

Otherwise we get build failures (about converting between wchar_t
and char) with wxWidgets 3.1.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 7ffb107bfc6bd8fdafff3b839530cae40dd2cfee..fe9a09900b62ce82b8f9c37db1ff49285a342115 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -18,69 +18,72 @@
 
 */
 
-#include "wx/wx_signal_manager.h"
-#include "wx/wx_util.h"
+
 #include "wx/about_dialog.h"
-#include "wx/report_problem_dialog.h"
 #include "wx/film_viewer.h"
-#include "wx/player_information.h"
-#include "wx/update_dialog.h"
+#include "wx/nag_dialog.h"
 #include "wx/player_config_dialog.h"
-#include "wx/verify_dcp_dialog.h"
-#include "wx/standard_controls.h"
+#include "wx/player_information.h"
+#include "wx/player_stress_tester.h"
 #include "wx/playlist_controls.h"
-#include "wx/timer_display.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/standard_controls.h"
 #include "wx/system_information_dialog.h"
-#include "wx/player_stress_tester.h"
+#include "wx/timer_display.h"
+#include "wx/update_dialog.h"
+#include "wx/verify_dcp_dialog.h"
 #include "wx/verify_dcp_progress_dialog.h"
-#include "wx/nag_dialog.h"
-#include "lib/cross.h"
-#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/internet.h"
-#include "lib/update_checker.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
 #include "lib/compose.hpp"
+#include "lib/config.h"
+#include "lib/cross.h"
 #include "lib/dcp_content.h"
-#include "lib/job_manager.h"
-#include "lib/job.h"
-#include "lib/film.h"
-#include "lib/null_log.h"
-#include "lib/video_content.h"
-#include "lib/text_content.h"
-#include "lib/ratio.h"
-#include "lib/verify_dcp_job.h"
 #include "lib/dcp_examiner.h"
-#include "lib/examine_content_job.h"
-#include "lib/server.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/dcpomatic_socket.h"
-#include "lib/scoped_temporary.h"
+#include "lib/examine_content_job.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/dcpomatic_log.h"
 #include "lib/file_log.h"
+#include "lib/film.h"
+#include "lib/internet.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/null_log.h"
+#include "lib/ratio.h"
+#include "lib/scoped_temporary.h"
+#include "lib/server.h"
+#include "lib/text_content.h"
+#include "lib/update_checker.h"
+#include "lib/util.h"
+#include "lib/verify_dcp_job.h"
+#include "lib/video_content.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
-#include <wx/splash.h>
+#include <dcp/raw_convert.h>
 #include <wx/cmdline.h>
+#include <wx/display.h>
 #include <wx/preferences.h>
 #include <wx/progdlg.h>
-#include <wx/display.h>
+#include <wx/splash.h>
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
-#include <boost/bind/bind.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
+
 #ifdef check
 #undef check
 #endif
 
 #define MAX_CPLS 32
 
+
 using std::cout;
 using std::dynamic_pointer_cast;
 using std::exception;
@@ -90,16 +93,17 @@ using std::shared_ptr;
 using std::string;
 using std::vector;
 using std::weak_ptr;
-using boost::scoped_array;
+using boost::bind;
 using boost::optional;
+using boost::scoped_array;
 using boost::thread;
-using boost::bind;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using dcp::raw_convert;
 using namespace dcpomatic;
 
+
 enum {
        ID_file_open = 1,
        ID_file_add_ov,
@@ -135,6 +139,7 @@ enum {
        ID_go_to_end
 };
 
+
 class DOMFrame : public wxFrame
 {
 public:

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 12dd0cadf287dff0859945e12c80afdcd1cdce49..cd1b5bfa9b7628e82c1f0d702e89ccec0ac63347 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -18,19 +18,23 @@
 
 */
 
-#include "lib/film.h"
-#include "lib/audio_analysis.h"
-#include "lib/playlist.h"
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/film.h"
+#include "lib/audio_analysis.h"
+#include "lib/playlist.h"
 #include <boost/signals2.hpp>
 
+
 class AudioPlot;
 class FilmViewer;
 class Film;
 
+
 class AudioDialog : public wxDialog
 {
 public:

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index aad152a622172be69fb25d9f82adc9e542ad468e..7bbda0e54e46df929a9b3d90784bc5e7d07fdcf9 100644 (file)
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -25,12 +25,13 @@
  */
 
 
-#include "lib/audio_mapping.h"
-#include "lib/types.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/audio_mapping.h"
+#include "lib/types.h"
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 5e8f925975c6e41564d5f76a70fc3bbe22b19630..bdb3b9be461d6edb5c9548a87cb622eb7ecf7519 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -19,10 +19,11 @@
 */
 
 
-#include "lib/audio_mapping.h"
 #include "content_sub_panel.h"
 #include "content_widget.h"
 
+#include "lib/audio_mapping.h"
+
 
 class wxSpinCtrlDouble;
 class wxButton;

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 9edabf8ec70b5cc605bfd932c07fb2b1e9083db0..7d996e5d80cf5bc374df12e8d59a36d3cb3dfa95 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -18,12 +18,13 @@
 
 */
 
-#include "lib/util.h"
-#include "lib/audio_analysis.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/util.h"
+#include "lib/audio_analysis.h"
 #include <boost/signals2.hpp>
 #include <vector>
 

diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc
index 06f6988746707900e58d09a82b766a90da2fbe23..baf1c295e32542bcaeb916b005df70de20a9dba4 100644 (file)
--- a/src/wx/batch_job_view.cc
+++ b/src/wx/batch_job_view.cc
@@ -19,11 +19,12 @@
 */
 
 
+#include <wx/sizer.h>
+#include <wx/button.h>
+
 #include "batch_job_view.h"
 #include "dcpomatic_button.h"
 #include "lib/job_manager.h"
-#include <wx/sizer.h>
-#include <wx/button.h>
 
 
 using std::list;

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 7fcfc0808667a4d0d0271cda359044da98c5a088..200c2f415d61047090eae9c0feb79b8c70124a33 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "closed_captions_dialog.h"
 #include "wx_util.h"
 #include "film_viewer.h"
@@ -27,6 +28,7 @@
 #include "lib/compose.hpp"
 #include <boost/bind/bind.hpp>
 
+
 using std::list;
 using std::max;
 using std::cout;

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 1f0e450ff3203bc632ec2601d898af05a57963c6..76f3c1525e8e0b7104138948c8f54ead84f444de 100644 (file)
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -18,17 +18,21 @@
 
 */
 
-#include "lib/dcpomatic_time.h"
-#include "lib/player.h"
-#include "lib/text_ring_buffers.h"
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "lib/dcpomatic_time.h"
+#include "lib/player.h"
+#include "lib/text_ring_buffers.h"
+
+
 class Butler;
 class FilmViewer;
 
+
 class ClosedCaptionsDialog : public wxDialog
 {
 public:

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 8a3548419aac8d7a9f5067b4a834004fb772f6b8..57311322ac1939f285ab0f608f3794940e58661c 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -18,18 +18,23 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_MENU_H
 #define DCPOMATIC_CONTENT_MENU_H
 
+
+#include <wx/wx.h>
+
 #include "timeline_content_view.h"
 #include "lib/types.h"
-#include <wx/wx.h>
 #include <memory>
 
+
 class Film;
 class Job;
 class DCPContent;
 
+
 class ContentMenu
 {
 public:

diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index 3f8317bf9d95b295659e253d594872d847d278df..270fc79cb7f5d5a0ebda621b84aec98546f32bdc 100644 (file)
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -18,20 +18,24 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H
 #define DCPOMATIC_CONTENT_SUB_PANEL_H
 
-#include "lib/film.h"
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+#include "lib/film.h"
+
 
 class ContentPanel;
 class Content;
 class DCPContent;
 class wxGridBagSizer;
 
+
 class ContentSubPanel : public wxScrolledWindow
 {
 public:

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 9a22d770908ae6d6e581fbce6427b59c4389ba72..7c5d1d44a3335b87b6032cb6a54ae560c53ceafc 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -23,13 +23,14 @@
 #define DCPOMATIC_CONTROLS_H
 
 
-#include "lib/dcpomatic_time.h"
-#include "lib/types.h"
-#include "lib/film.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/dcpomatic_time.h"
+#include "lib/types.h"
+#include "lib/film.h"
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index cf6189efa7192a961f5727a224441ef543fb9fe4..6a9be9575083cc15ae247c273eb4380c151f79ee 100644 (file)
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -18,16 +18,17 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/warnings.h"
+
+#include "check_box.h"
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
 #include "dkdm_output_panel.h"
 #include "kdm_timing_panel.h"
-#include "confirm_kdm_email_dialog.h"
-#include "wx_util.h"
 #include "name_format_editor.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/config.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -39,6 +40,7 @@ DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <wx/stdpaths.h>
 
+
 using std::pair;
 using std::string;
 using std::list;

diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 43e66a172dd4c5255896d02b9e5768affa5c4735..5ff6c39299538c4278b29917e0a049b162e0ce6a 100644 (file)
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -18,9 +18,9 @@
 
 */
 
-#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
 #include "name_format_editor.h"
+#include "lib/kdm_with_metadata.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <boost/filesystem.hpp>

diff --git a/src/wx/download_certificate_dialog.h b/src/wx/download_certificate_dialog.h
index ef241a0cab5d046ba9b2edcfed25af74a6f34627..8940618d0984af3b569c37b0a8618b8f0000f63d 100644 (file)
--- a/src/wx/download_certificate_dialog.h
+++ b/src/wx/download_certificate_dialog.h
@@ -19,12 +19,13 @@
 */
 
 #include "lib/warnings.h"
-#include <dcp/certificate.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/notebook.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include <dcp/certificate.h>
+
 class DownloadCertificatePanel;
 
 class DownloadCertificateDialog : public wxDialog

diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h
index 25271c7701dbb21ab26be7087f9c8bc23520e89f..e54715791f51b92b2d9a13edcaefae5cf77e6069 100644 (file)
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -24,10 +24,11 @@
 
 
 #include "lib/warnings.h"
-#include <dcp/certificate.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include <dcp/certificate.h>
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6aff127d8a6cfe4156a478e8a971220aad133fae..b9151cfc4d7e57a043baa28423fe7f3baf76e023 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -24,11 +24,12 @@
  */
 
 
-#include "lib/film.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/film.h"
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 2efe448c9e4deeaa37ba58e73e1511cf3ae48ee8..439c4b203b5edbf78ff684def93953b184e2d33b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -24,17 +24,18 @@
  */
 
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 #include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/signaller.h"
-#include "lib/warnings.h"
 #include <RtAudio.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc
index b530f7481634c5c8cd14d032e2969fe07f189918..15d183922d1c3f21b2967fa92bdde07888ea5bc1 100644 (file)
--- a/src/wx/focus_manager.cc
+++ b/src/wx/focus_manager.cc
@@ -18,18 +18,23 @@
 
 */
 
-#include "focus_manager.h"
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/textctrl.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "focus_manager.h"
+
+
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
+
 FocusManager* FocusManager::_instance;
 
+
 FocusManager *
 FocusManager::instance()
 {

diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index a26dcc0bb81a2862ca77a2d612292e6d37effa1f..f4f4c0e1c77611f96b6483eb2d8f38da3cf51568 100644 (file)
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -19,12 +19,13 @@
 */
 
 
-#include "lib/dcpomatic_assert.h"
-#include "full_language_tag_dialog.h"
-#include <dcp/language_tag.h>
 #include <wx/listctrl.h>
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
+
+#include "lib/dcpomatic_assert.h"
+#include "full_language_tag_dialog.h"
+#include <dcp/language_tag.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>

diff --git a/src/wx/full_language_tag_dialog.h b/src/wx/full_language_tag_dialog.h
index 1d4c4ac10f1c90eac126380b095dec519a49dfef..62827551b7866540c9a01a8d58e0daf20170e20e 100644 (file)
--- a/src/wx/full_language_tag_dialog.h
+++ b/src/wx/full_language_tag_dialog.h
@@ -24,11 +24,12 @@
 
 
 #include "lib/warnings.h"
-#include <dcp/language_tag.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include <dcp/language_tag.h>
+
 
 class wxListCtrl;
 class LanguageSubtagPanel;

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 36edd6b8b979111285a7df2dcc4421efbd37c0f1..c543b21fe8cb6804d87d69a270c4bb9903a854ea 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -18,14 +18,15 @@
 
 */
 
-#include "video_view.h"
-#include "lib/signaller.h"
-#include "lib/position.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "video_view.h"
+#include "lib/signaller.h"
+#include "lib/position.h"
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
 #include <boost/thread.hpp>

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 231176e4fd96c773d1f96a779de648647f0ddf3a..a17c658e70ad122a364e2d8a89f338c404b5957e 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -19,6 +19,8 @@
 */
 
 
+#include <wx/wx.h>
+
 #include "job_view.h"
 #include "wx_util.h"
 #include "message_dialog.h"
@@ -32,7 +34,6 @@
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
 #include "lib/analyse_audio_job.h"
-#include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
 
 

diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h
index 4b461b8139e78795dc4d42ffbf9f9f3b1da5a536..e049a5a92c93917ece6fb07120b662518d6bcad0 100644 (file)
--- a/src/wx/kdm_cpl_panel.h
+++ b/src/wx/kdm_cpl_panel.h
@@ -18,13 +18,16 @@
 
 */
 
-#include "lib/types.h"
+
 #include "lib/warnings.h"
-#include <boost/filesystem.hpp>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "lib/types.h"
+#include <boost/filesystem.hpp>
+
+
 class KDMCPLPanel : public wxPanel
 {
 public:

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index e8515d2c6c3e6ef90e831de73ff2746e357db05b..975480e4be2ecb333c7b27084e3d0d73191a853a 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -18,11 +18,12 @@
 
 */
 
-#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
+#include <wx/wx.h>
+
+#include "lib/kdm_with_metadata.h"
 #include "name_format_editor.h"
 #include <dcp/types.h>
-#include <wx/wx.h>
 #include <boost/filesystem.hpp>
 
 class wxRadioButton;

diff --git a/src/wx/nag_dialog.h b/src/wx/nag_dialog.h
index 11fb907f067c4dd0e55a4a3e4b697396fb7c7b86..f9472328a0558d319c516ec3c7e5840e80e0d383 100644 (file)
--- a/src/wx/nag_dialog.h
+++ b/src/wx/nag_dialog.h
@@ -19,12 +19,13 @@
 */
 
 
-#include "lib/config.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "lib/config.h"
+
 
 class NagDialog : public wxDialog
 {

diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index 596b427409c2447ec621a80d66abe3b8906d62d3..6b9ca50b669eeec0087ed3d56848746ccc6a7743 100644 (file)
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -23,12 +23,13 @@
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
 
-#include "lib/compose.hpp"
 #include "lib/warnings.h"
-#include <dcp/name_format.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/compose.hpp"
+#include <dcp/name_format.h>
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 6d2b7e9f207b3386e3a2633be4aa4b3bc6d1b609..d3e6c58981117b7d656fe216f1065c93a43f8113 100644 (file)
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -19,10 +19,11 @@
 */
 
 
+#include <wx/wx.h>
+
 #include "normal_job_view.h"
 #include "dcpomatic_button.h"
 #include "lib/job.h"
-#include <wx/wx.h>
 
 
 using std::shared_ptr;

diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index aacfccd9a90b96cc2695f3326b85c8a0390f8935..d5455b85731079e17d41182cf92bb9c9fcf6b02b 100644 (file)
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -19,13 +19,14 @@
 */
 
 
-#include "lib/dkdm_recipient.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/dkdm_recipient.h"
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>

diff --git a/src/wx/rgba_colour_picker.cc b/src/wx/rgba_colour_picker.cc
index 731cf95396181cc9ef72814ee56f9533c903b3e5..82519278bcd7e823942d66d3106feddb453b4374 100644 (file)
--- a/src/wx/rgba_colour_picker.cc
+++ b/src/wx/rgba_colour_picker.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "rgba_colour_picker.h"
 #include "wx_util.h"
 #include "static_text.h"
@@ -26,10 +27,11 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/clrpicker.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+
 RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
        : wxPanel (parent, wxID_ANY)
 {
-       wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _picker = new wxColourPickerCtrl (this, wxID_ANY);
        _picker->SetColour (wxColour (colour.r, colour.g, colour.b));
@@ -42,13 +44,15 @@ RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
        SetSizer (sizer);
 }
 
+
 RGBA
 RGBAColourPicker::colour () const
 {
-       wxColour const c = _picker->GetColour ();
+       auto const c = _picker->GetColour ();
        return RGBA (c.Red(), c.Green(), c.Blue(), _alpha->GetValue());
 }
 
+
 void
 RGBAColourPicker::set (RGBA colour)
 {

diff --git a/src/wx/rgba_colour_picker.h b/src/wx/rgba_colour_picker.h
index 30c81b103b107dc78d039ac1a24a0562b4ff20c5..5c2f3f362d1306d19b173b9bd50731e22f55d1bf 100644 (file)
--- a/src/wx/rgba_colour_picker.h
+++ b/src/wx/rgba_colour_picker.h
@@ -18,15 +18,18 @@
 
 */
 
-#include "lib/rgba.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "lib/rgba.h"
+
+
 class wxColourPickerCtrl;
 class wxSlider;
 
+
 class RGBAColourPicker : public wxPanel
 {
 public:

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 5761222c64eec703decaf228c3dfb760e11b39b4..87d42daf16f00e0c0d32110f4aee12d43b11736d 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -18,9 +18,9 @@
 
 */
 
-#include "lib/encode_server.h"
 #include "server_dialog.h"
 #include "wx_util.h"
+#include "lib/encode_server.h"
 
 using std::string;
 using std::shared_ptr;

diff --git a/src/wx/servers_list_dialog.cc b/src/wx/servers_list_dialog.cc
index d904a2ef08d394e54c3c8647feec83a740d29aaa..b4deca8e3945c7725db939d220dae62282e732d4 100644 (file)
--- a/src/wx/servers_list_dialog.cc
+++ b/src/wx/servers_list_dialog.cc
@@ -18,16 +18,19 @@
 
 */
 
+
 #include "servers_list_dialog.h"
 #include "wx_util.h"
 #include "lib/encode_server_finder.h"
 #include "lib/encode_server_description.h"
 #include <boost/lexical_cast.hpp>
 
+
 using std::list;
 using std::string;
 using boost::lexical_cast;
 
+
 ServersListDialog::ServersListDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Encoding Servers"))
 {
@@ -69,6 +72,7 @@ ServersListDialog::ServersListDialog (wxWindow* parent)
        servers_list_changed ();
 }
 
+
 void
 ServersListDialog::servers_list_changed ()
 {

diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h
index dc261ff1c8e718de348017b7170ccfa06e597db6..e5af9b6512ff1e3d66103f457a59346500353061 100644 (file)
--- a/src/wx/servers_list_dialog.h
+++ b/src/wx/servers_list_dialog.h
@@ -18,14 +18,17 @@
 
 */
 
-#include "lib/encode_server.h"
+
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/encode_server.h"
 #include <boost/signals2.hpp>
 
+
 class ServersListDialog : public wxDialog
 {
 public:

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 31756b5d85eceecbe62a693a5ed524adeb6edf5f..d070499327e2b10322c3ebd4d3e58dead89fc64c 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -18,14 +18,15 @@
 
 */
 
-#include "video_view.h"
-#include "lib/position.h"
 #include "lib/warnings.h"
-#include <dcp/types.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "video_view.h"
+#include "lib/position.h"
+#include <dcp/types.h>
+
 class FilmViewer;
 
 class SimpleVideoView : public VideoView

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 3b674b5c17eb04562932ca23e54d2668cc144b89..4a39b913976eba1476bc3a5bb123a006e37928ed 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -18,28 +18,31 @@
 
 */
 
-#include "text_view.h"
+
 #include "film_viewer.h"
+#include "text_view.h"
 #include "wx_util.h"
-#include "lib/string_text_file_decoder.h"
-#include "lib/content_text.h"
-#include "lib/video_decoder.h"
 #include "lib/audio_decoder.h"
-#include "lib/film.h"
 #include "lib/config.h"
+#include "lib/content_text.h"
+#include "lib/film.h"
 #include "lib/string_text_file_content.h"
+#include "lib/string_text_file_decoder.h"
 #include "lib/text_decoder.h"
+#include "lib/video_decoder.h"
+
 
+using std::dynamic_pointer_cast;
 using std::list;
 using std::shared_ptr;
 using std::weak_ptr;
 using boost::bind;
-using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
+
 TextView::TextView (
        wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer
        )
@@ -73,12 +76,12 @@ TextView::TextView (
                _list->InsertColumn (2, ip);
        }
 
-       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       auto sizer = new wxBoxSizer (wxVERTICAL);
        sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
        _list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&TextView::subtitle_selected, this, _1));
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+       auto buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
                sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
@@ -104,6 +107,7 @@ TextView::TextView (
        SetSizerAndFit (sizer);
 }
 
+
 void
 TextView::data_start (ContentStringText cts)
 {
@@ -120,6 +124,7 @@ TextView::data_start (ContentStringText cts)
        _last_count = cts.subs.size ();
 }
 
+
 void
 TextView::data_stop (ContentTime time)
 {
@@ -132,6 +137,7 @@ TextView::data_stop (ContentTime time)
        }
 }
 
+
 void
 TextView::subtitle_selected (wxListEvent& ev)
 {
@@ -140,9 +146,9 @@ TextView::subtitle_selected (wxListEvent& ev)
        }
 
        DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
-       shared_ptr<Content> lc = _content.lock ();
+       auto lc = _content.lock ();
        DCPOMATIC_ASSERT (lc);
-       shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+       auto fv = _film_viewer.lock ();
        DCPOMATIC_ASSERT (fv);
        /* Add on a frame here to work around any rounding errors and make sure land in the subtitle */
        fv->seek (lc, _start_times[ev.GetIndex()] + ContentTime::from_frames(1, _frc->source), true);

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index b44742b6313afeeb524454f59577fbdc4e8f0700..a368ed5b2975e136d9cd34756a11ab91e2b1069a 100644 (file)
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -18,13 +18,14 @@
 
 */
 
-#include "lib/content_text.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/listctrl.h>
 
+#include "lib/content_text.h"
+
 class Decoder;
 class FilmViewer;
 class Film;

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index b532e74e3730989bb78124cc7a8cacf9e997dd86..ff0d01077178c51f8a2c5929ac867a7cc40dfcfb 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -18,14 +18,16 @@
 
 */
 
+#include <wx/wx.h>
+
 #include "content_menu.h"
 #include "timeline_content_view.h"
 #include "lib/util.h"
 #include "lib/rect.h"
 #include "lib/film.h"
-#include <wx/wx.h>
 #include <boost/signals2.hpp>
 
+
 class Film;
 class ContentPanel;
 class TimelineView;
@@ -34,6 +36,7 @@ class TimelineReelsView;
 class TimelineLabelsView;
 class FilmViewer;
 
+
 class Timeline : public wxPanel
 {
 public:

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 7087e9641b62cd7073792cfa97441ff89b0fabd8..465b17d59a1dffa34c743ee95ef0e243ddbf32bb 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -23,13 +23,14 @@
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
 
-#include "lib/change_signaller.h"
-#include "lib/types.h"
 #include "lib/warnings.h"
-#include "timeline_view.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include "lib/change_signaller.h"
+#include "lib/types.h"
+#include "timeline_view.h"
 #include <boost/signals2.hpp>
 
 class Content;

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index 4450fef0552ec2dd4f60e4ef59f24370655b09df..2497fc5f8d925e5f825e84c01eacdb23ac71fc81 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -19,11 +19,12 @@
 */
 
 
-#include "timeline_labels_view.h"
-#include "timeline.h"
 #include <wx/wx.h>
 #include <wx/graphics.h>
 
+#include "timeline_labels_view.h"
+#include "timeline.h"
+
 
 using std::list;
 using std::max;

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index cf1abb34f6b961f21fd6552ab66c6a4911e562d9..a2755702f60b862f4fd6a8f26553863dfc96f492 100644 (file)
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -19,11 +19,12 @@
 */
 
 
-#include "timeline_reels_view.h"
-#include "timeline.h"
 #include <wx/wx.h>
 #include <wx/graphics.h>
 
+#include "timeline_reels_view.h"
+#include "timeline.h"
+
 
 using std::min;
 using std::list;

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index e9de1b542fab6b1777993b09a920009d420903bc..da0099998de031f4265b175c10dd4c3600a9597a 100644 (file)
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -18,16 +18,20 @@
 
 */
 
+
+#include <wx/wx.h>
+#include <wx/graphics.h>
+
 #include "timeline_time_axis_view.h"
 #include "timeline.h"
 #include "wx_util.h"
-#include <wx/wx.h>
-#include <wx/graphics.h>
+
 
 using std::list;
 using std::cout;
 using namespace dcpomatic;
 
+
 TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
        : TimelineView (tl)
        , _y (y)

diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc
index b0f4b4f5d34dd255a8a5083b7ca883f96b5d160d..6ab9a5c6f4ef5b072d9b64a974e3cb329b3df687 100644 (file)
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/timeline_video_content_view.cc
@@ -18,13 +18,16 @@
 
 */
 
+
+#include "timeline_video_content_view.h"
 #include "lib/image_content.h"
 #include "lib/video_content.h"
-#include "timeline_video_content_view.h"
+
 
 using std::dynamic_pointer_cast;
 using std::shared_ptr;
 
+
 TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Content> c)
        : TimelineContentView (tl, c)
 {

diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc
index 10d6dc5beb9d1e4f4d9cf9e1d584ca5c629ce7e5..0b6b0579bb7c87ca72aa2a89f3e784e18bf788d2 100644 (file)
--- a/src/wx/timeline_view.cc
+++ b/src/wx/timeline_view.cc
@@ -19,8 +19,8 @@
 */
 
 
-#include "timeline_view.h"
 #include "timeline.h"
+#include "timeline_view.h"
 
 
 using std::list;

diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h
index dc1810d125a42bdcc5725e29d0a91c3ffba608f9..db5b830f78af1c7c4749e31ff01eefa42d2e59d9 100644 (file)
--- a/src/wx/verify_dcp_dialog.h
+++ b/src/wx/verify_dcp_dialog.h
@@ -18,11 +18,12 @@
 
 */
 
-#include <dcp/verify.h>
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+
+#include <dcp/verify.h>
 #include <map>
 
 

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 387d4052fd87b1f02298b8c6ba8dbac083b43dc8..3f5190728e24bcf04c940c6c8fefd07706279aa8 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -19,8 +19,9 @@
 */
 
 
-#include "video_view.h"
 #include "wx_util.h"
+
+#include "video_view.h"
 #include "film_viewer.h"
 #include "lib/butler.h"
 #include "lib/dcpomatic_log.h"

diff --git a/src/wx/wx_signal_manager.cc b/src/wx/wx_signal_manager.cc
index 78a98b1d60e036bd433acb9399f3ac45e4479fba..84b9edd1b7022077191bd7fcb42cf824f0c93492 100644 (file)
--- a/src/wx/wx_signal_manager.cc
+++ b/src/wx/wx_signal_manager.cc
@@ -18,12 +18,13 @@
 
 */
 
-#include "wx_signal_manager.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#include "wx_signal_manager.h"
+
 wxSignalManager::wxSignalManager (wxEvtHandler* h)
        : _handler (h)
 {

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 585a30611ec82f462ac0f129ce8c32f668a06956..ed417f1c0196820dc48da5eb9786c779c86fd763 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -28,12 +28,13 @@
 #define DCPOMATIC_WX_UTIL_H
 
 
-#include "lib/dcpomatic_time.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/gbsizer.h>
+
+#include "lib/dcpomatic_time.h"
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>