Extract constants.h

10 files changed, 18 insertions, 8 deletions

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 2767a7f59..f0cf0606b 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -20,6 +20,7 @@
 
 
 #include "lib/audio_analysis.h"
+#include "lib/constants.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
 #include <dcp/warnings.h>
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cac939ac0..abd538037 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -25,6 +25,7 @@
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
 #include "lib/maths_util.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 8755053f5..f3d80b5e5 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -18,8 +18,9 @@
 
 */
 
-#include "lib/util.h"
+
 #include "lib/audio_analysis.h"
+#include "lib/constants.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 7fcfc0808..903d47c75 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -18,20 +18,23 @@
 
 */
 
+
 #include "closed_captions_dialog.h"
-#include "wx_util.h"
 #include "film_viewer.h"
-#include "lib/string_text.h"
+#include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/text_content.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
+#include "lib/string_text.h"
+#include "lib/text_content.h"
 #include <boost/bind/bind.hpp>
 
+
+using std::cout;
 using std::list;
+using std::make_pair;
 using std::max;
-using std::cout;
 using std::pair;
-using std::make_pair;
 using std::shared_ptr;
 using std::weak_ptr;
 using boost::optional;
@@ -40,6 +43,7 @@ using namespace boost::placeholders;
 #endif
 using namespace dcpomatic;
 
+
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
 	: wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
 #ifdef DCPOMATIC_OSX
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index b23b4bae8..6403d7e12 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -25,6 +25,7 @@
 #include "dcpomatic_button.h"
 #include "nag_dialog.h"
 #include "static_text.h"
+#include "lib/constants.h"
 #include <dcp/file.h>
 #include <dcp/raw_convert.h>
 
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index e0d7f15b8..ce2686864 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -33,7 +33,6 @@
 #include "lib/filter.h"
 #include "lib/log.h"
 #include "lib/ratio.h"
-#include "lib/util.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 32a4c9ac9..80976e5f6 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -31,6 +31,7 @@
 #include "lib/audio_content.h"
 #include "lib/config.h"
 #include "lib/content_factory.h"
+#include "lib/constants.h"
 #include "lib/copy_dcp_details_to_film.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_examiner.h"
diff --git a/src/wx/make_chain_dialog.cc b/src/wx/make_chain_dialog.cc
index 4255fb307..fedff470b 100644
--- a/src/wx/make_chain_dialog.cc
+++ b/src/wx/make_chain_dialog.cc
@@ -21,6 +21,7 @@
 
 #include "make_chain_dialog.h"
 #include "static_text.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/util.h"
 #include <dcp/certificate_chain.h>
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index ad5fda862..c098aa970 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -26,6 +26,7 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 797b32a55..a2c4f0f2f 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -18,11 +18,11 @@
 
 */
 
+
 #include "content_menu.h"
 #include "timeline_content_view.h"
 #include "lib/film.h"
 #include "lib/rect.h"
-#include "lib/util.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>