From da38c8a0156808595be0aae1b1490069a663fb78 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Dec 2022 00:47:30 +0100 Subject: [PATCH] Extract constants.h --- src/lib/audio_content.cc | 1 + src/lib/audio_filter_graph.cc | 2 ++ src/lib/audio_mapping.cc | 3 +- src/lib/audio_stream.cc | 2 +- src/lib/config.cc | 2 +- src/lib/constants.h | 53 ++++++++++++++++++++++++++++++++ src/lib/dcp_subtitle_decoder.cc | 1 + src/lib/encode_server.cc | 16 +++++----- src/lib/encode_server_finder.cc | 8 ++--- src/lib/ffmpeg_content.cc | 20 ++++++------ src/lib/ffmpeg_decoder.h | 1 - src/lib/film.cc | 2 +- src/lib/film.h | 2 +- src/lib/filter_graph.h | 3 +- src/lib/hints.cc | 1 + src/lib/image_content.cc | 1 + src/lib/image_decoder.cc | 1 + src/lib/j2k_encoder.h | 1 - src/lib/job.cc | 1 + src/lib/job_manager.cc | 1 + src/lib/playlist.h | 3 +- src/lib/util.cc | 1 + src/lib/util.h | 25 --------------- src/lib/video_decoder.h | 5 ++- src/lib/video_filter_graph.cc | 2 ++ src/tools/dcpomatic.cc | 2 +- src/tools/dcpomatic_combiner.cc | 2 +- src/tools/dcpomatic_editor.cc | 2 +- src/tools/dcpomatic_kdm.cc | 2 +- src/tools/dcpomatic_player.cc | 2 +- src/tools/dcpomatic_playlist.cc | 2 +- src/wx/audio_dialog.h | 1 + src/wx/audio_plot.cc | 1 + src/wx/audio_plot.h | 3 +- src/wx/closed_captions_dialog.cc | 14 ++++++--- src/wx/config_dialog.cc | 1 + src/wx/config_dialog.h | 1 - src/wx/content_menu.cc | 1 + src/wx/make_chain_dialog.cc | 1 + src/wx/playlist_controls.cc | 1 + src/wx/timeline.h | 2 +- test/audio_mapping_test.cc | 3 +- test/ffmpeg_encoder_test.cc | 1 + test/hints_test.cc | 2 +- test/import_dcp_test.cc | 1 + test/silence_padding_test.cc | 1 + test/subtitle_font_id_test.cc | 1 + test/vf_kdm_test.cc | 13 ++++---- 48 files changed, 137 insertions(+), 81 deletions(-) create mode 100644 src/lib/constants.h diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index acd3b81b4..1fcd33583 100644 --- 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 73c3aa6f7..4e3052d57 100644 --- 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 #include diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 5e8bf4d04..cd5c1fc7e 100644 --- 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 #include #include diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc index 43e4c5ec1..bd53c9b26 100644 --- 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 4bc4f60f2..81d4ab160 100644 --- 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 #include diff --git a/src/lib/constants.h b/src/lib/constants.h new file mode 100644 index 000000000..3b1871554 --- /dev/null +++ b/src/lib/constants.h @@ -0,0 +1,53 @@ +/* + Copyright (C) 2012-2020 Carl Hetherington + + 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 . + +*/ + + +#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 cbfe6fdbe..617f7ec53 100644 --- 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 #include diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index d326c767b..6501dcde1 100644 --- 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 #include diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index e01019a8c..3f5cb74f0 100644 --- 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 #include #include diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 515b58cd0..6681a4f0a 100644 --- 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 #include extern "C" { diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 1e47e2fca..bd4b74f88 100644 --- 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 } diff --git a/src/lib/film.cc b/src/lib/film.cc index 29952d0f2..5543a0d01 100644 --- 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 diff --git a/src/lib/film.h b/src/lib/film.h index 72d6d5e8d..b1451c212 100644 --- 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 #include #include diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h index 4019b5863..d56f15296 100644 --- 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 LIBDCP_DISABLE_WARNINGS extern "C" { #include } LIBDCP_ENABLE_WARNINGS +#include +#include struct AVFilterContext; diff --git a/src/lib/hints.cc b/src/lib/hints.cc index 46296351b..8db0099c1 100644 --- 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 1415fef24..bb2de9307 100644 --- 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 #include diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index 59dc4e873..26a9ad624 100644 --- 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 diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h index ef925b8de..63228a6b8 100644 --- 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 #include diff --git a/src/lib/job.cc b/src/lib/job.cc index 8ce63ced0..12bcff415 100644 --- 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 608df7ef0..e17b12853 100644 --- 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 diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 921637bc3..89f36f895 100644 --- 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 #include #include diff --git a/src/lib/util.cc b/src/lib/util.cc index 829e6de97..7680f2632 100644 --- 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 acdc861ae..38accb4e3 100644 --- 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 828ac66a2..f6ee17425 100644 --- 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 diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc index 26f858437..89467ae94 100644 --- 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 001d1859e..5ff04de22 100644 --- 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 diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index e773e4a37..fb788ef6b 100644 --- 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 LIBDCP_DISABLE_WARNINGS #include diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc index 6bb3c2785..51135ef46 100644 --- 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 #include #include diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 28f4d2514..7ecfb443f 100644 --- 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 #include #include diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 096da0004..7a2ae67f4 100644 --- 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 diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 96dff56ed..2bca4106b 100644 --- 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 LIBDCP_DISABLE_WARNINGS #include 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 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 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 LIBDCP_DISABLE_WARNINGS #include 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 + +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 #include 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 #include #include 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 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 LIBDCP_DISABLE_WARNINGS #include diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc index ca58c03ca..4e1042759 100644 --- a/test/audio_mapping_test.cc +++ b/test/audio_mapping_test.cc @@ -27,7 +27,8 @@ #include #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 88321d794..0881d2e2e 100644 --- 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 ce7e87b9c..42c1c7cda 100644 --- 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 diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 874e3d418..e759289be 100644 --- 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 6bcb82d05..28218e22f 100644 --- 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 85fe179c4..95fd9da08 100644 --- 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 #include #include diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index ff7c07b73..e52b11e67 100644 --- 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 #include -- 2.30.2