Extract constants.h

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index acd3b81b4295e817d54de91c9f3787b144b95886..1fcd335839926f2d77cea716c701ebc666035af0 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -22,6 +22,7 @@
 #include "audio_content.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "exceptions.h"
 #include "film.h"
 #include "frame_rate_change.h"

diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index 73c3aa6f7417c58c9a564ccc27115efb74496d8b..4e3052d57c519eccc3f390e01d5f3e4c3ad6da5f 100644 (file)
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -22,6 +22,8 @@
 #include "audio_buffers.h"
 #include "audio_filter_graph.h"
 #include "compose.hpp"
+#include "dcpomatic_assert.h"
+#include "exceptions.h"
 extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 5e8bf4d04713de054caddefd383eb18167b71395..cd5c1fc7e58cc6fdba1b7a3a5984d8144d88bf63 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -21,8 +21,9 @@
 
 #include "audio_mapping.h"
 #include "audio_processor.h"
+#include "constants.h"
+#include "dcpomatic_assert.h"
 #include "digester.h"
-#include "util.h"
 #include <dcp/raw_convert.h>
 #include <dcp/warnings.h>
 #include <libcxml/cxml.h>

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index 43e4c5ec13d924fe4baef0e2981c4167c500673f..bd53c9b26aa2d4a26f3713b9cc4dfd152903cc16 100644 (file)
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -21,7 +21,7 @@
 
 #include "audio_stream.h"
 #include "audio_mapping.h"
-#include "util.h"
+#include "constants.h"
 
 
 AudioStream::AudioStream (int frame_rate, Frame length, int channels)

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 4bc4f60f2f5640d6fa264fc9055d55a1e0e9b1b0..81d4ab16038ac1261f9e47630ef5e6c244aec686 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -23,6 +23,7 @@
 #include "colour_conversion.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
 #include "crypto.h"
 #include "dcp_content_type.h"
@@ -33,7 +34,6 @@
 #include "log.h"
 #include "ratio.h"
 #include "types.h"
-#include "util.h"
 #include "zipper.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/name_format.h>

diff --git a/src/lib/constants.h b/src/lib/constants.h
new file mode 100644 (file)
index 0000000..3b18715
--- /dev/null
+++ b/src/lib/constants.h
@@ -0,0 +1,53 @@
+/*
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#ifndef DCPOMATIC_CONSTANTS_H
+#define DCPOMATIC_CONSTANTS_H
+
+
+/** The maximum number of audio channels that we can have in a DCP */
+#define MAX_DCP_AUDIO_CHANNELS 16
+/** Message broadcast to find possible encoding servers */
+#define DCPOMATIC_HELLO "I mean really, Ray, it's used."
+/** Number of films to keep in history */
+#define HISTORY_SIZE 10
+#define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
+#define TEXT_FONT_ID "font"
+/** Largest KDM size (in bytes) that will be accepted */
+#define MAX_KDM_SIZE (256 * 1024)
+/** Number of lines that closed caption viewers will display */
+#define MAX_CLOSED_CAPTION_LINES 3
+/** Maximum line length of closed caption viewers, according to SMPTE Bv2.1 */
+#define MAX_CLOSED_CAPTION_LENGTH 32
+/** Maximum size of a subtitle / closed caption MXF in bytes, according to SMPTE Bv2.1 */
+#define MAX_TEXT_MXF_SIZE (115 * 1024 * 1024)
+#define MAX_TEXT_MXF_SIZE_TEXT "115MB"
+/** Maximum size of a font file, in bytes */
+#define MAX_FONT_FILE_SIZE (640 * 1024)
+#define MAX_FONT_FILE_SIZE_TEXT "640KB"
+/** Maximum size of the XML part of a closed caption file, according to SMPTE Bv2.1 */
+#define MAX_CLOSED_CAPTION_XML_SIZE (256 * 1024)
+#define MAX_CLOSED_CAPTION_XML_SIZE_TEXT "256KB"
+#define CERTIFICATE_VALIDITY_PERIOD (10 * 365)
+
+
+#endif
+

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index cbfe6fdbe29866302a1ee7218e55c4f4d1ed253b..617f7ec536530b71e83558f0f871b216cfe84312 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -23,6 +23,7 @@
 #include "dcp_subtitle_decoder.h"
 #include "font.h"
 #include "text_content.h"
+#include "util.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
 

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index d326c767be226aa240255504354a4ae08a33ef75..6501dcde15bed5b6a5af3d7b5275415370284769 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -25,18 +25,18 @@
  */
 
 
-#include "encode_server.h"
-#include "util.h"
-#include "dcpomatic_socket.h"
-#include "image.h"
-#include "dcp_video.h"
+#include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
-#include "player_video.h"
-#include "compose.hpp"
-#include "log.h"
+#include "dcp_video.h"
 #include "dcpomatic_log.h"
+#include "dcpomatic_socket.h"
+#include "encode_server.h"
 #include "encoded_log_entry.h"
+#include "image.h"
+#include "log.h"
+#include "player_video.h"
 #include "version.h"
 #include <dcp/raw_convert.h>
 #include <dcp/warnings.h>

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index e01019a8c92f9c1747bef9d6bba7d0f77fa1d19a..3f5cb74f01bddbe659dc2360446d454bdbe06725 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -19,13 +19,13 @@
 */
 
 
-#include "encode_server_finder.h"
-#include "exceptions.h"
-#include "util.h"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
-#include "encode_server_description.h"
 #include "dcpomatic_socket.h"
+#include "encode_server_description.h"
+#include "encode_server_finder.h"
+#include "exceptions.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <boost/bind/placeholders.hpp>

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 515b58cd0fbaa82eac39ec95d2194525b2f39406..6681a4f0a897aa6c6c9de3c192c1cad434d69a8c 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -19,22 +19,22 @@
 
 */
 
-#include "ffmpeg_content.h"
-#include "video_content.h"
 #include "audio_content.h"
-#include "ffmpeg_examiner.h"
-#include "ffmpeg_subtitle_stream.h"
-#include "ffmpeg_audio_stream.h"
 #include "compose.hpp"
-#include "job.h"
-#include "util.h"
-#include "filter.h"
-#include "film.h"
-#include "log.h"
 #include "config.h"
+#include "constants.h"
 #include "exceptions.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_content.h"
+#include "ffmpeg_examiner.h"
+#include "ffmpeg_subtitle_stream.h"
+#include "film.h"
+#include "filter.h"
 #include "frame_rate_change.h"
+#include "job.h"
+#include "log.h"
 #include "text_content.h"
+#include "video_content.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 1e47e2fca61bf962ef10b5fdfcef3851b74176de..bd4b74f88395ddfbb9461ffbcfbd515632fac017 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -28,7 +28,6 @@
 #include "decoder.h"
 #include "ffmpeg.h"
 #include "video_filter_graph_set.h"
-#include "util.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 29952d0f2e8f57fe6e10a7920af1fbce42940338..5543a0d01a70b72f8a08abee84476ac5b4c20523 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -32,6 +32,7 @@
 #include "cinema.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
 #include "dcp_content.h"
 #include "dcp_content_type.h"
@@ -56,7 +57,6 @@
 #include "text_content.h"
 #include "transcode_job.h"
 #include "upload_job.h"
-#include "util.h"
 #include "video_content.h"
 #include "version.h"
 #include <libcxml/cxml.h>

diff --git a/src/lib/film.h b/src/lib/film.h
index 72d6d5e8d409bce8b2751e565c6fce1de789e751..b1451c212092b2ec5435ef8cb00c6b46a3093008 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -31,11 +31,11 @@
 
 #include "change_signaller.h"
 #include "dcp_text_track.h"
+#include "dcpomatic_time.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
 #include "transcode_job.h"
 #include "types.h"
-#include "util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/file.h>
 #include <dcp/key.h>

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 4019b5863249e6d6b5ee9b1ea864021f025920bc..d56f15296bf608d6daf8c30ff8f576fa8c372f9d 100644 (file)
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -28,13 +28,14 @@
 #define DCPOMATIC_FILTER_GRAPH_H
 
 
-#include "util.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/buffersink.h>
 }
 LIBDCP_ENABLE_WARNINGS
+#include <string>
+#include <vector>
 
 
 struct AVFilterContext;

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 46296351be71e899a6ffdbc4a29972d9c3e52309..8db0099c18f23152274989368790c5094fbab409 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -24,6 +24,7 @@
 #include "audio_processor.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "content.h"
 #include "cross.h"
 #include "dcp_content_type.h"

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 1415fef2448fc5ad6ab1f5e033c7a35dfdc856c6..bb2de93073e42cc8b88a040a34c9163bd3e7de74 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -27,6 +27,7 @@
 #include "image_examiner.h"
 #include "image_filename_sorter.h"
 #include "job.h"
+#include "util.h"
 #include "video_content.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 59dc4e873fd92fcaa5a0723351b6fda862ff51ad..26a9ad624b31fb168633c7aa3f721f44edf403db 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -27,6 +27,7 @@
 #include "image_content.h"
 #include "image_decoder.h"
 #include "j2k_image_proxy.h"
+#include "util.h"
 #include "video_content.h"
 #include "video_decoder.h"
 #include <boost/filesystem.hpp>

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index ef925b8de5a7344f7aefe1e46871f173a6315553..63228a6b8fac8cb7635de681bbabf4d5b14b46d2 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -32,7 +32,6 @@
 #include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include "util.h"
 #include "writer.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 8ce63ced0213d66ea2c03dce79bd3a29579562d0..12bcff415ec63a8ef3d49b4d3263b460ff7e08ce 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -25,6 +25,7 @@
 
 
 #include "compose.hpp"
+#include "constants.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
 #include "exceptions.h"

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 608df7ef0af9063729824f7c3967d6d76b7a02fe..e17b12853747b2ac8db640f6e22a500e3611c332 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -30,6 +30,7 @@
 #include "film.h"
 #include "job.h"
 #include "job_manager.h"
+#include "util.h"
 #include <boost/thread.hpp>
 
 

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 921637bc3a6d8e6cfcfea9535aae3ae3fc963701..89f36f89567572febf2cdaaf2fea8d08df25dca2 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -24,8 +24,9 @@
 
 
 #include "change_signaller.h"
+#include "dcpomatic_time.h"
 #include "frame_rate_change.h"
-#include "util.h"
+#include "types.h"
 #include <libcxml/cxml.h>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 829e6de97ad6dfa248874e20d71686a3237e2eb4..7680f26323fbb86d2ad07bdac4f8274acb2766e5 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -31,6 +31,7 @@
 #include "cinema_sound_processor.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
 #include "crypto.h"
 #include "dcp_content_type.h"

diff --git a/src/lib/util.h b/src/lib/util.h
index acdc861ae1cc0cd125c1fecf2236f2a2202986be..38accb4e31beec10de93fde9a65f77f915012bf8 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -52,31 +52,6 @@ namespace dcp {
        class SubtitleAsset;
 }
 
-/** The maximum number of audio channels that we can have in a DCP */
-#define MAX_DCP_AUDIO_CHANNELS 16
-/** Message broadcast to find possible encoding servers */
-#define DCPOMATIC_HELLO "I mean really, Ray, it's used."
-/** Number of films to keep in history */
-#define HISTORY_SIZE 10
-#define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
-#define TEXT_FONT_ID "font"
-/** Largest KDM size (in bytes) that will be accepted */
-#define MAX_KDM_SIZE (256 * 1024)
-/** Number of lines that closed caption viewers will display */
-#define MAX_CLOSED_CAPTION_LINES 3
-/** Maximum line length of closed caption viewers, according to SMPTE Bv2.1 */
-#define MAX_CLOSED_CAPTION_LENGTH 32
-/** Maximum size of a subtitle / closed caption MXF in bytes, according to SMPTE Bv2.1 */
-#define MAX_TEXT_MXF_SIZE (115 * 1024 * 1024)
-#define MAX_TEXT_MXF_SIZE_TEXT "115MB"
-/** Maximum size of a font file, in bytes */
-#define MAX_FONT_FILE_SIZE (640 * 1024)
-#define MAX_FONT_FILE_SIZE_TEXT "640KB"
-/** Maximum size of the XML part of a closed caption file, according to SMPTE Bv2.1 */
-#define MAX_CLOSED_CAPTION_XML_SIZE (256 * 1024)
-#define MAX_CLOSED_CAPTION_XML_SIZE_TEXT "256KB"
-#define CERTIFICATE_VALIDITY_PERIOD (10 * 365)
-
 extern std::string program_name;
 extern bool is_batch_converter;
 

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 828ac66a20af1cbbff7785f039b9c1fd8a32bddb..f6ee17425b6d77b48d6b074c5d369f6cfbd888c3 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -28,11 +28,10 @@
 #define DCPOMATIC_VIDEO_DECODER_H
 
 
-#include "decoder.h"
-#include "video_content.h"
-#include "util.h"
 #include "content_video.h"
+#include "decoder.h"
 #include "decoder_part.h"
+#include "video_content.h"
 #include <boost/signals2.hpp>
 
 

diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc
index 26f858437173294e80cb1691b708ab6ae000254e..89467ae94e50746dccd5704f8be099bc78b9e9a2 100644 (file)
--- a/src/lib/video_filter_graph.cc
+++ b/src/lib/video_filter_graph.cc
@@ -20,6 +20,8 @@
 
 
 #include "compose.hpp"
+#include "dcpomatic_assert.h"
+#include "exceptions.h"
 #include "image.h"
 #include "scope_guard.h"
 #include "video_filter_graph.h"

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 001d1859eec93fd51219f229b02ee386ab333c89..5ff04de228bd0611092a8b9610c2b58bee113b4c 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -60,6 +60,7 @@
 #include "lib/cinema.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
@@ -86,7 +87,6 @@
 #include "lib/text_content.h"
 #include "lib/transcode_job.h"
 #include "lib/update_checker.h"
-#include "lib/util.h"
 #include "lib/version.h"
 #include "lib/video_content.h"
 #include <dcp/exceptions.h>

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index e773e4a37e3bfcaef0dc77df8592e36fb8bd922b..fb788ef6b51d558ebd7f0c6d3620e0eff127d40a 100644 (file)
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -24,9 +24,9 @@
 #include "wx/wx_signal_manager.h"
 #include "lib/combine_dcp_job.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/job_manager.h"
-#include "lib/util.h"
 #include <dcp/combine.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>

diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index 6bb3c2785eb396b4fd22f74210c8d140950924b3..51135ef462372f38750aa22f3452d49ce1a1ac36 100644 (file)
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -23,10 +23,10 @@
 #include "wx/editable_list.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/null_log.h"
-#include "lib/util.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 28f4d2514e829aa9b5a1af9b99217204c82568be..7ecfb443fee38070a6715e5363fa7176534968a6 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -37,6 +37,7 @@
 #include "lib/cinema.h"
 #include "lib/collator.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
@@ -47,7 +48,6 @@
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
-#include "lib/util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 096da00047d24538388a5237d07b4543aa85682e..7a2ae67f4bec8ab1b5e45bf4adb4ab4b6cd1c12d 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -36,6 +36,7 @@
 #include "wx/wx_util.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_examiner.h"
@@ -59,7 +60,6 @@
 #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>

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 96dff56ed21ec169264eb6d822ae7f3a8ac5366e..2bca4106b2f158adcf007973157e4798c582252f 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -26,12 +26,12 @@
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
-#include "lib/util.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/imaglist.h>

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 2767a7f5926100698c4b5917afd66372f0972cfe..f0cf0606bbf1b56b02c8d403da74d665f2b11a80 100644 (file)
--- 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 cac939ac0a19de4bdf6018e81f90187f41cf6c51..abd538037e5f6e53ff996443dfa283d883406aff 100644 (file)
--- 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 8755053f53339bf7e107a6086c061e9a5a926aeb..f3d80b5e5ec99b918d5c15382a86246ecb4769e3 100644 (file)
--- 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 7fcfc0808667a4d0d0271cda359044da98c5a088..903d47c7526ce98c36415fa90d74f36e67b68939 100644 (file)
--- 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 b23b4bae80542c359aad86bea14b2dabd48cc44e..6403d7e12a25b551cc92220515883e18873859f1 100644 (file)
--- 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 e0d7f15b8447cc1c9f59f35f6ab5113882671a7d..ce2686864838e8a21f9dec1ce0a1c683e131f82b 100644 (file)
--- 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 32a4c9ac9f30768477263995aa677f5908eaf609..80976e5f678b80c5f152a33821d0d06fa10320c7 100644 (file)
--- 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 4255fb307881dcba3a98930b87db7f377f8793dd..fedff470b6139bfe5dd0a2f970e10704241dab35 100644 (file)
--- 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 ad5fda862c0012b2c24f052e430f652a9cf4cd98..c098aa970dfd2413940e38bcde7651c35b75a6a5 100644 (file)
--- 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 797b32a55e831623aa0e43e1cfd4ac8483b118ac..a2c4f0f2fda7d56fe5be086c2323db1e07ccbc0c 100644 (file)
--- 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>

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index ca58c03ca0a8a965ef64ee95476b9589a14150d2..4e1042759f29ad5a3261c8d0124a74bbdd87d704 100644 (file)
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -27,7 +27,8 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_mapping.h"
-#include "lib/util.h"
+#include "lib/constants.h"
+#include "lib/compose.hpp"
 
 
 using std::list;

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 88321d794b234fcc78be8f14a58de5db5b48b5ed..0881d2e2e1007b40dad31c069c64724231586d2b 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -22,6 +22,7 @@
 #include "lib/audio_content.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/dcpomatic_log.h"

diff --git a/test/hints_test.cc b/test/hints_test.cc
index ce7e87b9c90e323947010cbe58dbd92ce3e4ea6d..42c1c7cdaab7ac01008bbf2961b5c9d0a2b28fa5 100644 (file)
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -21,6 +21,7 @@
 
 #include "lib/audio_content.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
@@ -28,7 +29,6 @@
 #include "lib/font.h"
 #include "lib/hints.h"
 #include "lib/text_content.h"
-#include "lib/util.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 874e3d418333eb456d23c0d1617e780ba5865243..e759289bee878b621f3d1bff76496d1c7a1719e0 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -26,6 +26,7 @@
 
 
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 6bcb82d0598f442a5906e0faaa904f65c3b26749..28218e22fa0f9f7e6205cd577fa61e8620a9ac73 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -25,6 +25,7 @@
  */
 
 
+#include "lib/constants.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"

diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index 85fe179c47a52bb800219864e27b54c1f88e3898..95fd9da083709876ad41a9437ecf42f315b7c9ef 100644 (file)
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -24,6 +24,7 @@
 #include "lib/film.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
+#include "lib/util.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index ff7c07b73ca86fdbf018589c28eb1e7dc9ee3608..e52b11e674abaa91d3e9d512cecedffa470a01b3 100644 (file)
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -26,14 +26,15 @@
 
 
 #include "test.h"
-#include "lib/film.h"
-#include "lib/dcp_subtitle_content.h"
-#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_content_type.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
 #include "lib/screen.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>