From: Carl Hetherington Date: Fri, 22 Apr 2022 21:27:15 +0000 (+0200) Subject: Use libdcp's warnings.h X-Git-Tag: v2.16.10~44 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3c29aa6531a4046a8db72dcac81189eb8893233c Use libdcp's warnings.h --- diff --git a/src/lib/analytics.cc b/src/lib/analytics.cc index 7483166ba..75146cb45 100644 --- a/src/lib/analytics.cc +++ b/src/lib/analytics.cc @@ -22,12 +22,12 @@ #include "analytics.h" #include "compose.hpp" #include "exceptions.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc index cc74209e0..ada304dad 100644 --- a/src/lib/atmos_content.cc +++ b/src/lib/atmos_content.cc @@ -20,11 +20,11 @@ #include "atmos_content.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::make_shared; diff --git a/src/lib/audio_analyser.cc b/src/lib/audio_analyser.cc index 755d6e9b0..c9fc2118c 100644 --- a/src/lib/audio_analyser.cc +++ b/src/lib/audio_analyser.cc @@ -31,15 +31,15 @@ #include "filter.h" #include "playlist.h" #include "types.h" -#include "warnings.h" +#include extern "C" { #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG #include #endif -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS } diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index b16fa708a..721ffed07 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -24,11 +24,11 @@ #include "util.h" #include "playlist.h" #include "audio_content.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index aa67f5097..5e8bf4d04 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -23,12 +23,12 @@ #include "audio_processor.h" #include "digester.h" #include "util.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/lib/audio_point.cc b/src/lib/audio_point.cc index abf8485e3..1f32d25fc 100644 --- a/src/lib/audio_point.cc +++ b/src/lib/audio_point.cc @@ -20,11 +20,11 @@ #include "audio_point.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 6cf4ed646..b0c81e91c 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -18,37 +18,41 @@ */ -#include "config.h" + #include "colour_conversion.h" -#include "util.h" +#include "config.h" #include "digester.h" -#include "warnings.h" -#include +#include "util.h" #include #include -#include #include +#include +#include #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" -using std::list; -using std::string; + using std::cout; -using std::vector; +using std::dynamic_pointer_cast; +using std::list; using std::make_shared; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; -using std::dynamic_pointer_cast; using dcp::raw_convert; + vector PresetColourConversion::_presets; + ColourConversion::ColourConversion () : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ()) { diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc index 9f42610bd..d313445da 100644 --- a/src/lib/cross_common.cc +++ b/src/lib/cross_common.cc @@ -23,11 +23,11 @@ #include "compose.hpp" #include "dcpomatic_assert.h" #include "dcpomatic_log.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 14b8c71ba..d7d1089fc 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -26,14 +26,14 @@ #include "dcpomatic_log.h" #include "exceptions.h" #include "log.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #if BOOST_VERSION >= 106100 #include diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index b11ac90ef..02f720fee 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -25,7 +25,6 @@ #include "dcpomatic_log.h" #include "config.h" #include "exceptions.h" -#include "warnings.h" #include #include extern "C" { @@ -527,9 +526,9 @@ void make_foreground_application () { ProcessSerialNumber serial; -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS GetCurrentProcess (&serial); -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS TransformProcessType (&serial, kProcessTransformToForegroundApplication); } diff --git a/src/lib/dcp_digest_file.cc b/src/lib/dcp_digest_file.cc index 0ea5ae821..eb243b60d 100644 --- a/src/lib/dcp_digest_file.cc +++ b/src/lib/dcp_digest_file.cc @@ -20,7 +20,6 @@ #include "dcp_digest_file.h" -#include "warnings.h" #include #include #include @@ -28,9 +27,10 @@ #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::dynamic_pointer_cast; diff --git a/src/lib/dcp_text_track.h b/src/lib/dcp_text_track.h index b29d8c489..4b5ed4512 100644 --- a/src/lib/dcp_text_track.h +++ b/src/lib/dcp_text_track.h @@ -23,12 +23,12 @@ #define DCPOMATIC_DCP_TEXT_TRACK_H -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class DCPTextTrack diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 4a41e17b9..50d33e9d5 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -42,15 +42,15 @@ #include "log.h" #include "player_video.h" #include "rng.h" -#include "warnings.h" #include #include #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc index 4698c159d..532bbb314 100644 --- a/src/lib/dkdm_wrapper.cc +++ b/src/lib/dkdm_wrapper.cc @@ -22,10 +22,10 @@ #include "compose.hpp" #include "dkdm_wrapper.h" #include "dcpomatic_assert.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index cd471d171..d326c767b 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -38,12 +38,12 @@ #include "dcpomatic_log.h" #include "encoded_log_entry.h" #include "version.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #ifdef HAVE_VALGRIND_H diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 2a6d47a00..2e0347c79 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -23,10 +23,10 @@ #include "cross.h" #include "log.h" #include "version.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include @@ -34,7 +34,7 @@ extern "C" { #include #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 59b2dedd5..25d26e813 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -25,12 +25,12 @@ #include "file_group.h" #include "ffmpeg_subtitle_period.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc index 91020e288..05e1a3fc8 100644 --- a/src/lib/ffmpeg_audio_stream.cc +++ b/src/lib/ffmpeg_audio_stream.cc @@ -21,10 +21,10 @@ #include "ffmpeg_audio_stream.h" #include -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 01886da7f..fdcacb465 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -26,8 +26,8 @@ #include "ffmpeg_audio_stream.h" #include "ffmpeg_subtitle_stream.h" #include "util.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include @@ -37,7 +37,7 @@ extern "C" { #include #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index 9f3d88551..fc2b5c654 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -23,18 +23,18 @@ #define DCPOMATIC_FFMPEG_FILE_ENCODER_H +#include "audio_mapping.h" #include "encoder.h" #include "event_history.h" -#include "audio_mapping.h" #include "log.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class ExportAudioStream; diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index 94385eabd..f513eef2d 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -27,16 +27,16 @@ #include "ffmpeg_image_proxy.h" #include "image.h" #include "memory_util.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include #include } #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc index 2d85a90bb..47f71d119 100644 --- a/src/lib/ffmpeg_stream.cc +++ b/src/lib/ffmpeg_stream.cc @@ -20,14 +20,14 @@ #include "ffmpeg_stream.h" #include "dcpomatic_assert.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; using dcp::raw_convert; diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc index e500dd35b..1101901b7 100644 --- a/src/lib/ffmpeg_subtitle_stream.cc +++ b/src/lib/ffmpeg_subtitle_stream.cc @@ -19,11 +19,11 @@ */ #include "ffmpeg_subtitle_stream.h" -#include "warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include using std::string; diff --git a/src/lib/ffmpeg_wrapper.cc b/src/lib/ffmpeg_wrapper.cc index dbd2dce9f..19db54140 100644 --- a/src/lib/ffmpeg_wrapper.cc +++ b/src/lib/ffmpeg_wrapper.cc @@ -20,12 +20,12 @@ #include "ffmpeg_wrapper.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/lib/filter.cc b/src/lib/filter.cc index 5631af55a..bb48805e6 100644 --- a/src/lib/filter.cc +++ b/src/lib/filter.cc @@ -25,13 +25,12 @@ #include "filter.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS #include "i18n.h" diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h index 9ee628d4c..4019b5863 100644 --- a/src/lib/filter_graph.h +++ b/src/lib/filter_graph.h @@ -29,12 +29,12 @@ #include "util.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS struct AVFilterContext; diff --git a/src/lib/font.cc b/src/lib/font.cc index a2dc1945f..f750bfc88 100644 --- a/src/lib/font.cc +++ b/src/lib/font.cc @@ -21,10 +21,10 @@ #include "dcpomatic_assert.h" #include "font.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/lib/image.cc b/src/lib/image.cc index 19b3ea5a8..4f5b11c90 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -33,17 +33,17 @@ #include "memory_util.h" #include "rect.h" #include "timer.h" -#include "warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include #include #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #if HAVE_VALGRIND_MEMCHECK_H #include diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 67083e655..269b01bca 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -23,7 +23,6 @@ #include "dcpomatic_socket.h" #include "image.h" #include "j2k_image_proxy.h" -#include "warnings.h" #include #include #include @@ -31,10 +30,11 @@ #include #include #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" diff --git a/src/lib/kdm_recipient.h b/src/lib/kdm_recipient.h index 90e9fd16d..f18e71429 100644 --- a/src/lib/kdm_recipient.h +++ b/src/lib/kdm_recipient.h @@ -23,12 +23,12 @@ #define DCPOMATIC_KDM_RECIPIENT_H -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/lib/memory_util.cc b/src/lib/memory_util.cc index bac46bb1f..00117855d 100644 --- a/src/lib/memory_util.cc +++ b/src/lib/memory_util.cc @@ -19,12 +19,12 @@ */ -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/lib/pixel_quanta.h b/src/lib/pixel_quanta.h index 018ce3346..37d2321f4 100644 --- a/src/lib/pixel_quanta.h +++ b/src/lib/pixel_quanta.h @@ -23,13 +23,12 @@ #define DCPOMATIC_PIXEL_QUANTA_H -#include "warnings.h" - #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class PixelQuanta diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc index fb0d16df8..9b486dd5c 100644 --- a/src/lib/raw_image_proxy.cc +++ b/src/lib/raw_image_proxy.cc @@ -21,16 +21,16 @@ #include "raw_image_proxy.h" #include "image.h" -#include "warnings.h" #include #include +#include #include extern "C" { #include } -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include "i18n.h" diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 6f7614d36..0c14b00c4 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -26,13 +26,13 @@ #include "render_text.h" #include "types.h" #include "util.h" -#include "warnings.h" #include +#include #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/lib/rgba.cc b/src/lib/rgba.cc index 4d2c28085..2e6a4fab6 100644 --- a/src/lib/rgba.cc +++ b/src/lib/rgba.cc @@ -20,10 +20,10 @@ #include "rgba.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc index 9c349f233..8bb41e3b1 100644 --- a/src/lib/scp_uploader.cc +++ b/src/lib/scp_uploader.cc @@ -25,7 +25,6 @@ #include "config.h" #include "cross.h" #include "compose.hpp" -#include "warnings.h" #include #include "i18n.h" @@ -55,12 +54,12 @@ SCPUploader::SCPUploader (function set_status, functiontms_ip(), ssh_get_error(_session))); } -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS r = ssh_is_server_known (_session); if (r == SSH_SERVER_ERROR) { throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_is_server_known", ssh_get_error(_session))); } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ()); if (r != SSH_AUTH_SUCCESS) { diff --git a/src/lib/spl.cc b/src/lib/spl.cc index 8d0dcc6fc..3e5e957ff 100644 --- a/src/lib/spl.cc +++ b/src/lib/spl.cc @@ -21,12 +21,12 @@ #include "content_store.h" #include "spl.h" -#include "warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc index 878bd610f..f0b377a56 100644 --- a/src/lib/spl_entry.cc +++ b/src/lib/spl_entry.cc @@ -22,10 +22,10 @@ #include "dcp_content.h" #include "dcpomatic_assert.h" #include "spl_entry.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::shared_ptr; diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc index 0838816b0..9b3ae86c0 100644 --- a/src/lib/subtitle_analysis.cc +++ b/src/lib/subtitle_analysis.cc @@ -21,12 +21,12 @@ #include "subtitle_analysis.h" #include "exceptions.h" -#include "warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::make_shared; diff --git a/src/lib/types.cc b/src/lib/types.cc index 228ebf28f..e9b412ded 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -21,15 +21,15 @@ #include "types.h" #include "compose.hpp" #include "dcpomatic_assert.h" -#include "warnings.h" -#include #include #include -#include +#include #include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" diff --git a/src/lib/util.cc b/src/lib/util.cc index f2d35fa2f..7106cc782 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -49,22 +49,22 @@ #include "text_decoder.h" #include "util.h" #include "video_content.h" -#include "warnings.h" +#include #include #include -#include -#include #include +#include #include #include -#include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include #include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include @@ -75,9 +75,9 @@ DCPOMATIC_ENABLE_WARNINGS #include #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS #include #include @@ -242,7 +242,7 @@ addr2line (void const * const addr) return system(addr2line_cmd); } -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS /** This is called when C signals occur on Windows (e.g. SIGSEGV) * (NOT C++ exceptions!). We write a backtrace to backtrace_file by dark means. * Adapted from code here: http://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c/ @@ -299,7 +299,7 @@ exception_handler(struct _EXCEPTION_POINTERS * info) return EXCEPTION_CONTINUE_SEARCH; } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif void @@ -371,10 +371,10 @@ dcpomatic_setup () #endif #ifdef DCPOMATIC_HAVE_AVREGISTER -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS av_register_all (); avfilter_register_all (); -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif #ifdef DCPOMATIC_OSX diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc index 0c7e23b05..1cc142520 100644 --- a/src/lib/video_filter_graph.cc +++ b/src/lib/video_filter_graph.cc @@ -22,7 +22,6 @@ #include "compose.hpp" #include "image.h" #include "video_filter_graph.h" -#include "warnings.h" extern "C" { #include #include diff --git a/src/lib/warnings.h b/src/lib/warnings.h deleted file mode 100644 index ca8a9ab5e..000000000 --- a/src/lib/warnings.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 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 . - -*/ - -#if __GNUC__ >= 9 -#define DCPOMATIC_DISABLE_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ - _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \ - _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \ - _Pragma("GCC diagnostic ignored \"-Waddress\"") \ - _Pragma("GCC diagnostic ignored \"-Wparentheses\"") \ - _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"") \ - _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"") -#else -#define DCPOMATIC_DISABLE_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ - _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \ - _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \ - _Pragma("GCC diagnostic ignored \"-Waddress\"") \ - _Pragma("GCC diagnostic ignored \"-Wparentheses\"") \ - _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"") -#endif - -#define DCPOMATIC_ENABLE_WARNINGS \ - _Pragma("GCC diagnostic pop") diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 90c939a08..1ea9ab63b 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -88,17 +88,17 @@ #include "lib/util.h" #include "lib/version.h" #include "lib/video_content.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #ifdef __WXGTK__ #include #endif diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 1b84ca2bc..79f1b39fa 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -36,15 +36,15 @@ #include "lib/transcode_job.h" #include "lib/util.h" #include "lib/version.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 4a783d634..40587e23a 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -28,9 +28,9 @@ #include "lib/job_manager.h" #include "lib/util.h" #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 1907a6045..872850fba 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -40,9 +40,9 @@ #include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS #include #endif diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc index 67de360d3..627aacc86 100644 --- a/src/tools/dcpomatic_disk_writer.cc +++ b/src/tools/dcpomatic_disk_writer.cc @@ -60,9 +60,9 @@ extern "C" { } #endif -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 65bb921e5..98d701fab 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -48,14 +48,14 @@ #include #include #include -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #ifdef __WXOSX__ #include #endif diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 1ab83a230..46dead850 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -57,13 +57,13 @@ #include "lib/util.h" #include "lib/verify_dcp_job.h" #include "lib/video_content.h" -#include "lib/warnings.h" #include #include -#include #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include @@ -71,7 +71,7 @@ DCPOMATIC_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #ifdef __WXGTK__ #include #endif diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 5bae0c429..bf958b9f7 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -32,14 +32,14 @@ #include "lib/spl.h" #include "lib/spl_entry.h" #include "lib/util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index de25f531d..6cf0a9609 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -29,16 +29,17 @@ #include "lib/signaller.h" #include "lib/cross.h" #include "lib/dcpomatic_log.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +#include +LIBDCP_ENABLE_WARNINGS #include #include #include + using std::cout; using std::string; using std::exception; @@ -54,6 +55,7 @@ using std::dynamic_pointer_cast; using namespace boost::placeholders; #endif + enum { ID_status = 1, ID_quit, diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 37070bf0d..e80a92d24 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -18,23 +18,25 @@ */ + /** @file src/wx/about_dialog.cc * @brief The "about DCP-o-matic" dialogue box. */ #include "about_dialog.h" -#include "wx_util.h" #include "static_text.h" -#include "lib/version.h" +#include "wx_util.h" #include "lib/compose.hpp" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "lib/version.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::vector; + AboutDialog::AboutDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("About DCP-o-matic")) { diff --git a/src/wx/about_dialog.h b/src/wx/about_dialog.h index f3bb65a6c..f9b60ccc6 100644 --- a/src/wx/about_dialog.h +++ b/src/wx/about_dialog.h @@ -22,13 +22,15 @@ * @brief The "about DCP-o-matic" dialogue box. */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class wxNotebook; + /** @class AboutDialog * @brief The "about DCP-o-matic" dialogue box. */ diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 8ba69ec79..a202ad65b 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -18,19 +18,22 @@ */ -#include "lib/film.h" + #include "lib/audio_analysis.h" +#include "lib/film.h" #include "lib/playlist.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class AudioPlot; class FilmViewer; class Film; + class AudioDialog : public wxDialog { public: diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc index 13510e9d1..c16ec4cb6 100644 --- a/src/wx/audio_gain_dialog.cc +++ b/src/wx/audio_gain_dialog.cc @@ -22,10 +22,10 @@ #include "audio_gain_dialog.h" #include "wx_util.h" #include "lib/maths_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/audio_gain_dialog.h b/src/wx/audio_gain_dialog.h index 9f9c973cf..95c438c77 100644 --- a/src/wx/audio_gain_dialog.h +++ b/src/wx/audio_gain_dialog.h @@ -18,10 +18,13 @@ */ + #include "table_dialog.h" + class wxSpinCtrlDouble; + class AudioGainDialog : public TableDialog { public: diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 81fa1a70d..8818deb63 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -29,19 +29,17 @@ #include "wx_util.h" #include "lib/audio_mapping.h" #include "lib/maths_util.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS -#include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS -using std::cout; using std::list; using std::make_pair; using std::max; diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h index aad152a62..873fc5c93 100644 --- a/src/wx/audio_mapping_view.h +++ b/src/wx/audio_mapping_view.h @@ -21,16 +21,15 @@ /** @file src/wx/audio_mapping_view.h * @brief AudioMappingView class. - * */ #include "lib/audio_mapping.h" #include "lib/types.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index cfea4f026..f25af27f7 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -36,14 +36,12 @@ #include "lib/ffmpeg_content.h" #include "lib/job_manager.h" #include "lib/maths_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS -using std::cout; using std::dynamic_pointer_cast; using std::list; using std::make_shared; diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 0e9e815e1..fbcd9047f 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -26,10 +26,10 @@ #include "lib/audio_analysis.h" #include "lib/compose.hpp" #include "lib/maths_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h index 9edabf8ec..b2ffd5ad5 100644 --- a/src/wx/audio_plot.h +++ b/src/wx/audio_plot.h @@ -20,10 +20,10 @@ #include "lib/util.h" #include "lib/audio_analysis.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc index 6ce9f4680..96dd801d1 100644 --- a/src/wx/batch_job_view.cc +++ b/src/wx/batch_job_view.cc @@ -22,11 +22,11 @@ #include "batch_job_view.h" #include "dcpomatic_button.h" #include "lib/job_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/check_box.h b/src/wx/check_box.h index 65952040a..6e54ef411 100644 --- a/src/wx/check_box.h +++ b/src/wx/check_box.h @@ -24,10 +24,10 @@ #include "i18n_hook.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class CheckBox : public wxCheckBox, public I18NHook diff --git a/src/wx/christie_certificate_panel.h b/src/wx/christie_certificate_panel.h index 54536a81c..2898bfaa9 100644 --- a/src/wx/christie_certificate_panel.h +++ b/src/wx/christie_certificate_panel.h @@ -18,8 +18,10 @@ */ + #include "credentials_download_certificate_panel.h" + class ChristieCertificatePanel : public CredentialsDownloadCertificatePanel { public: diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h index 32dd77264..a878e6055 100644 --- a/src/wx/cinema_dialog.h +++ b/src/wx/cinema_dialog.h @@ -22,10 +22,10 @@ #include "editable_list.h" #include "email_dialog.h" #include "table_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 1f0e450ff..700b8922a 100644 --- a/src/wx/closed_captions_dialog.h +++ b/src/wx/closed_captions_dialog.h @@ -18,17 +18,19 @@ */ + #include "lib/dcpomatic_time.h" #include "lib/player.h" #include "lib/text_ring_buffers.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class Butler; class FilmViewer; + class ClosedCaptionsDialog : public wxDialog { public: diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index b4cf90fe7..b7c054e27 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -24,17 +24,17 @@ #include "static_text.h" #include "wx_util.h" #include "lib/colour_conversion.h" -#include "lib/warnings.h" #include #include #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::dynamic_pointer_cast; diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h index 294cdbf82..cc3c3d225 100644 --- a/src/wx/colour_conversion_editor.h +++ b/src/wx/colour_conversion_editor.h @@ -23,10 +23,10 @@ #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index f91ebe670..08e2721da 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -25,22 +25,23 @@ #include "dcpomatic_button.h" #include "audio_mapping_view.h" #include -#include -using std::string; -using std::vector; -using std::pair; + +using std::function; using std::make_pair; -using std::map; using std::make_shared; +using std::map; +using std::pair; +using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; using boost::optional; -using std::shared_ptr; -using std::function; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif + static bool do_nothing () diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index eade69043..3e71cb11a 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -34,19 +34,18 @@ #include "lib/log.h" #include "lib/ratio.h" #include "lib/util.h" -#include "lib/warnings.h" #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -#include class AudioMappingView; diff --git a/src/wx/config_move_dialog.cc b/src/wx/config_move_dialog.cc index baf55f18a..c9a0d7eae 100644 --- a/src/wx/config_move_dialog.cc +++ b/src/wx/config_move_dialog.cc @@ -18,11 +18,13 @@ */ + #include "config_move_dialog.h" -#include "wx_util.h" #include "static_text.h" +#include "wx_util.h" #include + ConfigMoveDialog::ConfigMoveDialog (wxWindow* parent, boost::filesystem::path new_file) : QuestionDialog ( parent, diff --git a/src/wx/config_move_dialog.h b/src/wx/config_move_dialog.h index b7cea1155..a84c8448c 100644 --- a/src/wx/config_move_dialog.h +++ b/src/wx/config_move_dialog.h @@ -18,9 +18,11 @@ */ + #include "question_dialog.h" #include + class ConfigMoveDialog : public QuestionDialog { public: diff --git a/src/wx/confirm_kdm_email_dialog.h b/src/wx/confirm_kdm_email_dialog.h index 7360f3513..108140937 100644 --- a/src/wx/confirm_kdm_email_dialog.h +++ b/src/wx/confirm_kdm_email_dialog.h @@ -20,10 +20,10 @@ #include "question_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc index 5b4650141..b860b2aad 100644 --- a/src/wx/content_advanced_dialog.cc +++ b/src/wx/content_advanced_dialog.cc @@ -31,12 +31,13 @@ #include "lib/ffmpeg_content.h" #include "lib/image_content.h" #include "lib/video_content.h" +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_DISABLE_WARNINGS -#include #include #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h index 84ad4afac..1dd2b472d 100644 --- a/src/wx/content_advanced_dialog.h +++ b/src/wx/content_advanced_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 54f56f432..5b5a1983c 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -26,14 +26,12 @@ #include "lib/colour_conversion.h" #include "lib/config.h" #include "lib/util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS -using std::cout; using std::string; using std::vector; using boost::optional; diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h index ec9d374b7..e42961019 100644 --- a/src/wx/content_colour_conversion_dialog.h +++ b/src/wx/content_colour_conversion_dialog.h @@ -20,10 +20,10 @@ #include "lib/colour_conversion.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 47f88b491..3b49a85cc 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -39,15 +39,15 @@ #include "lib/image_content.h" #include "lib/job_manager.h" #include "lib/playlist.h" -#include "lib/warnings.h" #include #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::dynamic_pointer_cast; diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index dceb0effe..910afc720 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -25,10 +25,10 @@ #include "timeline_content_view.h" #include "lib/types.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index e42413d9d..f93b0d471 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -45,13 +45,13 @@ #include "lib/string_text_file_content.h" #include "lib/text_content.h" #include "lib/video_content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 604a15fe4..d6c81a8d2 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -22,10 +22,10 @@ #include "content_menu.h" #include "lib/film.h" #include "lib/types.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc index 0c775287a..4fe378bf2 100644 --- a/src/wx/content_sub_panel.cc +++ b/src/wx/content_sub_panel.cc @@ -25,10 +25,10 @@ #include "lib/dcp_content.h" #include "lib/compose.hpp" #include "lib/log.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h index 3f8317bf9..2817fab6e 100644 --- a/src/wx/content_sub_panel.h +++ b/src/wx/content_sub_panel.h @@ -18,20 +18,23 @@ */ + #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H #define DCPOMATIC_CONTENT_SUB_PANEL_H + #include "lib/film.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class ContentPanel; class Content; class DCPContent; class wxGridBagSizer; + class ContentSubPanel : public wxScrolledWindow { public: diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index a020f8148..f4c9aca9d 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -28,13 +28,13 @@ #include "lib/dcpomatic_assert.h" #include "lib/examine_content_job.h" #include "lib/job_manager.h" -#include "lib/warnings.h" #include +#include #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/wx/content_view.h b/src/wx/content_view.h index d7c1a43ed..16ff5c463 100644 --- a/src/wx/content_view.h +++ b/src/wx/content_view.h @@ -20,10 +20,10 @@ #include "lib/content_store.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h index 23b409a97..788d1449a 100644 --- a/src/wx/content_widget.h +++ b/src/wx/content_widget.h @@ -18,6 +18,7 @@ */ + /** @file src/wx/content_widget.h * @brief ContentWidget class. */ @@ -29,12 +30,12 @@ #include "wx_util.h" #include "lib/content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 62fec0a75..ba0691268 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -35,17 +35,17 @@ #include "lib/job.h" #include "lib/job_manager.h" #include "lib/player_video.h" -#include "lib/warnings.h" #include #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/wx/controls.h b/src/wx/controls.h index ca9c20087..0341da290 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -24,23 +24,23 @@ #include "lib/dcpomatic_time.h" -#include "lib/types.h" #include "lib/film.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "lib/types.h" +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -class FilmViewer; -class Film; class ClosedCaptionsDialog; class Content; +class ContentView; +class Film; +class FilmViewer; class PlayerVideo; -class wxToggleButton; class wxListCtrl; -class ContentView; +class wxToggleButton; namespace dcp { diff --git a/src/wx/credentials_download_certificate_panel.cc b/src/wx/credentials_download_certificate_panel.cc index 77c18e3c1..d90fc2719 100644 --- a/src/wx/credentials_download_certificate_panel.cc +++ b/src/wx/credentials_download_certificate_panel.cc @@ -18,15 +18,18 @@ */ + #include "download_certificate_dialog.h" #include "credentials_download_certificate_panel.h" #include "password_entry.h" #include "wx_util.h" + using std::string; using std::function; using boost::optional; + CredentialsDownloadCertificatePanel::CredentialsDownloadCertificatePanel ( DownloadCertificateDialog* dialog, function ()> get_username, diff --git a/src/wx/credentials_download_certificate_panel.h b/src/wx/credentials_download_certificate_panel.h index b9af14f5b..d0449e669 100644 --- a/src/wx/credentials_download_certificate_panel.h +++ b/src/wx/credentials_download_certificate_panel.h @@ -18,13 +18,17 @@ */ + #ifndef CREDENTIALS_DOWNLOAD_CERTIFICATE_PANEL_H #define CREDENTIALS_DOWNLOAD_CERTIFICATE_PANEL_H + #include "download_certificate_panel.h" + class PasswordEntry; + class CredentialsDownloadCertificatePanel : public DownloadCertificatePanel { public: diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc index 48f476a9f..e750b9baa 100644 --- a/src/wx/custom_scale_dialog.cc +++ b/src/wx/custom_scale_dialog.cc @@ -23,12 +23,12 @@ #include "wx_util.h" #include "lib/util.h" #include -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS using boost::optional; diff --git a/src/wx/custom_scale_dialog.h b/src/wx/custom_scale_dialog.h index 485b6acf5..d8cecad23 100644 --- a/src/wx/custom_scale_dialog.h +++ b/src/wx/custom_scale_dialog.h @@ -19,13 +19,13 @@ */ -#include "lib/warnings.h" #include "table_dialog.h" #include -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS class CustomScaleDialog : public TableDialog diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 914068b11..ab6bd22b5 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -43,14 +43,14 @@ #include "lib/text_content.h" #include "lib/util.h" #include "lib/video_content.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/dcp_text_track_dialog.h b/src/wx/dcp_text_track_dialog.h index c07369637..41a91b0d0 100644 --- a/src/wx/dcp_text_track_dialog.h +++ b/src/wx/dcp_text_track_dialog.h @@ -18,9 +18,11 @@ */ + #ifndef DCPOMATIC_DCP_TEXT_TRACK_DIALOG_H #define DCPOMATIC_DCP_TEXT_TRACK_DIALOG_H + #include "table_dialog.h" #include "wx_util.h" #include "lib/dcp_text_track.h" diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h index 7e0e01dc2..902c85666 100644 --- a/src/wx/dcpomatic_button.h +++ b/src/wx/dcpomatic_button.h @@ -24,10 +24,10 @@ #include "i18n_hook.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class Button : public wxButton, public I18NHook diff --git a/src/wx/dcpomatic_spin_ctrl.cc b/src/wx/dcpomatic_spin_ctrl.cc index 7d3972151..70bd7e3f7 100644 --- a/src/wx/dcpomatic_spin_ctrl.cc +++ b/src/wx/dcpomatic_spin_ctrl.cc @@ -20,12 +20,12 @@ #include "dcpomatic_spin_ctrl.h" -#include "lib/warnings.h" +#include +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS #include #include -DCPOMATIC_DISABLE_WARNINGS -#include -DCPOMATIC_ENABLE_WARNINGS #if BOOST_VERSION >= 106100 diff --git a/src/wx/dcpomatic_spin_ctrl.h b/src/wx/dcpomatic_spin_ctrl.h index 556cf6347..4a673ff93 100644 --- a/src/wx/dcpomatic_spin_ctrl.h +++ b/src/wx/dcpomatic_spin_ctrl.h @@ -23,11 +23,11 @@ #define DCPOMATIC_SPIN_CTRL_H -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class SpinCtrl : public wxSpinCtrl diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc index feb11a527..6c8fdd1fc 100644 --- a/src/wx/dir_picker_ctrl.cc +++ b/src/wx/dir_picker_ctrl.cc @@ -18,21 +18,24 @@ */ + +#include "dcpomatic_button.h" #include "dir_picker_ctrl.h" -#include "wx_util.h" #include "static_text.h" -#include "dcpomatic_button.h" -#include "lib/warnings.h" -#include -#include -DCPOMATIC_DISABLE_WARNINGS +#include "wx_util.h" +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +#include +LIBDCP_ENABLE_WARNINGS #include + using namespace std; using namespace boost; + DirPickerCtrl::DirPickerCtrl (wxWindow* parent) : wxPanel (parent) { diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h index 34f46b2df..f70168db4 100644 --- a/src/wx/dir_picker_ctrl.h +++ b/src/wx/dir_picker_ctrl.h @@ -18,15 +18,18 @@ */ + #ifndef DCPOMATIC_DIR_PICKER_CTRL #define DCPOMATIC_DIR_PICKER_CTRL -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class DirPickerCtrl : public wxPanel { public: diff --git a/src/wx/disk_warning_dialog.h b/src/wx/disk_warning_dialog.h index c690ea25d..d59f334ac 100644 --- a/src/wx/disk_warning_dialog.h +++ b/src/wx/disk_warning_dialog.h @@ -18,10 +18,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class DiskWarningDialog : public wxDialog { diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc index 5743cd712..c7503048c 100644 --- a/src/wx/dkdm_dialog.cc +++ b/src/wx/dkdm_dialog.cc @@ -32,17 +32,15 @@ #include "lib/film.h" #include "lib/job_manager.h" #include "lib/kdm_with_metadata.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS -using std::cout; using std::exception; using std::list; using std::make_pair; diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h index 5e7f01908..4a47d961f 100644 --- a/src/wx/dkdm_dialog.h +++ b/src/wx/dkdm_dialog.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" #include "wx_util.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc index cf6189efa..5b04f740a 100644 --- a/src/wx/dkdm_output_panel.cc +++ b/src/wx/dkdm_output_panel.cc @@ -18,34 +18,36 @@ */ -#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 #include +#include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#endif #include +LIBDCP_ENABLE_WARNINGS +#endif + -using std::pair; -using std::string; -using std::list; using std::exception; +using std::function; +using std::list; using std::make_pair; +using std::pair; using std::shared_ptr; -using std::function; +using std::string; DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent) diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h index 9ad2a40a5..297c31887 100644 --- a/src/wx/dkdm_output_panel.h +++ b/src/wx/dkdm_output_panel.h @@ -22,11 +22,11 @@ #include "name_format_editor.h" #include "wx_util.h" #include "lib/kdm_with_metadata.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index db4cd9f67..25f739239 100644 --- a/src/wx/dolby_doremi_certificate_panel.cc +++ b/src/wx/dolby_doremi_certificate_panel.cc @@ -29,10 +29,8 @@ #include #include #include -#include -using std::cout; using std::function; using std::list; using std::string; diff --git a/src/wx/download_certificate_dialog.h b/src/wx/download_certificate_dialog.h index a5085e174..12873c944 100644 --- a/src/wx/download_certificate_dialog.h +++ b/src/wx/download_certificate_dialog.h @@ -18,12 +18,14 @@ */ -#include "lib/warnings.h" + #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class DownloadCertificatePanel; diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h index 0e7b2ab71..cfa70241f 100644 --- a/src/wx/download_certificate_panel.h +++ b/src/wx/download_certificate_panel.h @@ -23,11 +23,11 @@ #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H -#include "lib/warnings.h" +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/drive_wipe_warning_dialog.cc b/src/wx/drive_wipe_warning_dialog.cc index 23e007a05..094a1dded 100644 --- a/src/wx/drive_wipe_warning_dialog.cc +++ b/src/wx/drive_wipe_warning_dialog.cc @@ -18,10 +18,12 @@ */ + #include "drive_wipe_warning_dialog.h" #include "static_text.h" #include "wx_util.h" + DriveWipeWarningDialog::DriveWipeWarningDialog (wxWindow* parent, wxString drive) : wxDialog (parent, wxID_ANY, _("Important notice")) { diff --git a/src/wx/drive_wipe_warning_dialog.h b/src/wx/drive_wipe_warning_dialog.h index 71a21b55f..7e6266d31 100644 --- a/src/wx/drive_wipe_warning_dialog.h +++ b/src/wx/drive_wipe_warning_dialog.h @@ -18,10 +18,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class DriveWipeWarningDialog : public wxDialog { diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index 6bf7f7b62..56c3a9463 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -25,11 +25,11 @@ #include "dcpomatic_button.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/export_subtitles_dialog.cc b/src/wx/export_subtitles_dialog.cc index 3fc5dcdb2..cb9629a18 100644 --- a/src/wx/export_subtitles_dialog.cc +++ b/src/wx/export_subtitles_dialog.cc @@ -23,10 +23,10 @@ #include "export_subtitles_dialog.h" #include "file_picker_ctrl.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h index c53df820e..db614f667 100644 --- a/src/wx/export_subtitles_dialog.h +++ b/src/wx/export_subtitles_dialog.h @@ -21,10 +21,10 @@ #include "dir_picker_ctrl.h" #include "table_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc index 76731bdf5..50ea5ca48 100644 --- a/src/wx/export_video_file_dialog.cc +++ b/src/wx/export_video_file_dialog.cc @@ -18,21 +18,25 @@ */ + #include "check_box.h" #include "export_video_file_dialog.h" #include "file_picker_ctrl.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + using std::string; using boost::bind; + #define FORMATS 2 + wxString format_names[] = { _("MOV / ProRes"), _("MP4 / H.264"), diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h index 0c93965ad..578585362 100644 --- a/src/wx/export_video_file_dialog.h +++ b/src/wx/export_video_file_dialog.h @@ -21,10 +21,10 @@ #include "table_dialog.h" #include "lib/ffmpeg_encoder.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc index 3eb05e44d..284f7bc99 100644 --- a/src/wx/file_picker_ctrl.cc +++ b/src/wx/file_picker_ctrl.cc @@ -18,20 +18,23 @@ */ + +#include "dcpomatic_button.h" #include "file_picker_ctrl.h" #include "wx_util.h" -#include "dcpomatic_button.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +#include +LIBDCP_ENABLE_WARNINGS #include + using namespace std; using namespace boost; + FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open, bool warn_overwrite) : wxPanel (parent) , _prompt (prompt) diff --git a/src/wx/file_picker_ctrl.h b/src/wx/file_picker_ctrl.h index 60858b665..df7226655 100644 --- a/src/wx/file_picker_ctrl.h +++ b/src/wx/file_picker_ctrl.h @@ -18,10 +18,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class FilePickerCtrl : public wxPanel { diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index d7493ad63..47fb46970 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -32,11 +32,11 @@ #include "lib/dcp_content.h" #include "lib/film.h" #include "lib/job_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 6aff127d8..61557ce1c 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -25,10 +25,10 @@ #include "lib/film.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc index e6a311901..2f3fefe49 100644 --- a/src/wx/film_name_location_dialog.cc +++ b/src/wx/film_name_location_dialog.cc @@ -28,10 +28,10 @@ #endif #include "lib/compose.hpp" #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h index 29fcd3384..a659ab22f 100644 --- a/src/wx/film_name_location_dialog.h +++ b/src/wx/film_name_location_dialog.h @@ -21,11 +21,11 @@ #include "table_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class DirPickerCtrl; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8cff277f3..34ff8dbc4 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -51,14 +51,14 @@ #include "lib/util.h" #include "lib/video_content.h" #include "lib/video_decoder.h" -#include "lib/warnings.h" +#include +#include extern "C" { #include } -#include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 0569131ea..2373af122 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -25,16 +25,16 @@ #include "video_view.h" -#include "lib/film.h" #include "lib/config.h" +#include "lib/film.h" #include "lib/player_text.h" -#include "lib/timer.h" #include "lib/signaller.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "lib/timer.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h index 33f92c0a6..44dbb502d 100644 --- a/src/wx/filter_dialog.h +++ b/src/wx/filter_dialog.h @@ -24,10 +24,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc index b530f7481..9f1aa7df8 100644 --- a/src/wx/focus_manager.cc +++ b/src/wx/focus_manager.cc @@ -18,18 +18,22 @@ */ + #include "focus_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif + FocusManager* FocusManager::_instance; + FocusManager * FocusManager::instance() { diff --git a/src/wx/focus_manager.h b/src/wx/focus_manager.h index 3c91c22fa..337d87739 100644 --- a/src/wx/focus_manager.h +++ b/src/wx/focus_manager.h @@ -18,11 +18,14 @@ */ + #include + class wxTextCtrl; class wxFocusEvent; + /** @class FocusManager class * @brief A central point for notifications about when wxTextCtrls get focus in the main window. * diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 668d8798b..e81f4a853 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -26,10 +26,10 @@ #include "lib/content.h" #include "lib/font.h" #include "lib/text_content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index b62ba3817..612971031 100644 --- a/src/wx/fonts_dialog.h +++ b/src/wx/fonts_dialog.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 3b9955bea..c13ec7ed0 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -52,16 +52,16 @@ #include "lib/log.h" #include "lib/ratio.h" #include "lib/util.h" -#include "lib/warnings.h" #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc index 19e52ff14..f597e82f7 100644 --- a/src/wx/full_language_tag_dialog.cc +++ b/src/wx/full_language_tag_dialog.cc @@ -21,13 +21,13 @@ #include "full_language_tag_dialog.h" #include "lib/dcpomatic_assert.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/full_language_tag_dialog.h b/src/wx/full_language_tag_dialog.h index 1d4c4ac10..99f1c3267 100644 --- a/src/wx/full_language_tag_dialog.h +++ b/src/wx/full_language_tag_dialog.h @@ -23,11 +23,11 @@ #define DCPOMATIC_FULL_LANGUAGE_TAG_DIALOG_H -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class wxListCtrl; diff --git a/src/wx/gain_calculator_dialog.h b/src/wx/gain_calculator_dialog.h index 41312cdca..e0d545660 100644 --- a/src/wx/gain_calculator_dialog.h +++ b/src/wx/gain_calculator_dialog.h @@ -20,10 +20,10 @@ #include "table_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/gdc_certificate_panel.h b/src/wx/gdc_certificate_panel.h index e41254e45..6e2e3303b 100644 --- a/src/wx/gdc_certificate_panel.h +++ b/src/wx/gdc_certificate_panel.h @@ -18,8 +18,10 @@ */ + #include "credentials_download_certificate_panel.h" + class GDCCertificatePanel : public CredentialsDownloadCertificatePanel { public: diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index e64cb63db..70c81ea79 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -19,12 +19,12 @@ */ -#include "lib/warnings.h" - -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + /* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support, * and I think it may even have things missing that we require (e.g. the attributes parameter diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 2ab28fa6c..05baf19ff 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -26,10 +26,10 @@ #include "lib/film.h" #include "lib/hints.h" #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::max; diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h index 37d36459c..1c77faf3e 100644 --- a/src/wx/hints_dialog.h +++ b/src/wx/hints_dialog.h @@ -20,10 +20,10 @@ #include "lib/change_signaller.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index dcae84cd9..824d4fabc 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -22,13 +22,12 @@ #include "html_dialog.h" #include "wx_util.h" #include "lib/cross.h" -#include "lib/warnings.h" -#include -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +#include +LIBDCP_ENABLE_WARNINGS +#include #if BOOST_VERSION >= 106100 diff --git a/src/wx/html_dialog.h b/src/wx/html_dialog.h index 2b6924179..1792d86ed 100644 --- a/src/wx/html_dialog.h +++ b/src/wx/html_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class wxHtmlLinkEvent; diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc index 15b9c1024..eb6e61d5f 100644 --- a/src/wx/i18n_hook.cc +++ b/src/wx/i18n_hook.cc @@ -23,10 +23,10 @@ #include "instant_i18n_dialog.h" #include "wx_util.h" #include "lib/cross.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/i18n_hook.h b/src/wx/i18n_hook.h index bb1bc8227..50c020b2a 100644 --- a/src/wx/i18n_hook.h +++ b/src/wx/i18n_hook.h @@ -23,10 +23,10 @@ #define DCPOMATIC_I18N_HOOK_H -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/image_sequence_dialog.h b/src/wx/image_sequence_dialog.h index 1a7ae5de7..d554ea908 100644 --- a/src/wx/image_sequence_dialog.h +++ b/src/wx/image_sequence_dialog.h @@ -20,10 +20,10 @@ #include "table_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class ImageSequenceDialog : public TableDialog diff --git a/src/wx/instant_i18n_dialog.h b/src/wx/instant_i18n_dialog.h index 418a1145d..ee7f94f4c 100644 --- a/src/wx/instant_i18n_dialog.h +++ b/src/wx/instant_i18n_dialog.h @@ -18,10 +18,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class InstantI18NDialog : public wxDialog { diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc index 08626c0ed..515127b84 100644 --- a/src/wx/interop_metadata_dialog.cc +++ b/src/wx/interop_metadata_dialog.cc @@ -24,11 +24,11 @@ #include "language_tag_widget.h" #include "rating_dialog.h" #include "lib/film.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::shared_ptr; diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h index fc1f9381d..1d7a5a6eb 100644 --- a/src/wx/interop_metadata_dialog.h +++ b/src/wx/interop_metadata_dialog.h @@ -21,12 +21,12 @@ #include "editable_list.h" #include "metadata_dialog.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h index e960bc2f6..c1a1744bf 100644 --- a/src/wx/job_manager_view.h +++ b/src/wx/job_manager_view.h @@ -24,10 +24,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index d4243cfb1..5a6484f0a 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -32,10 +32,10 @@ #include "lib/job_manager.h" #include "lib/send_notification_email_job.h" #include "lib/transcode_job.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc index 1ae145e66..c3ec8a6f3 100644 --- a/src/wx/kdm_advanced_dialog.cc +++ b/src/wx/kdm_advanced_dialog.cc @@ -22,10 +22,10 @@ #include "check_box.h" #include "kdm_advanced_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using boost::optional; diff --git a/src/wx/kdm_choice.h b/src/wx/kdm_choice.h index 8b216924a..11b0b6314 100644 --- a/src/wx/kdm_choice.h +++ b/src/wx/kdm_choice.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class KDMChoice : public wxChoice diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc index f45fc5291..b1bbc1cf0 100644 --- a/src/wx/kdm_cpl_panel.cc +++ b/src/wx/kdm_cpl_panel.cc @@ -18,18 +18,21 @@ */ + +#include "dcpomatic_button.h" #include "kdm_cpl_panel.h" -#include "wx_util.h" #include "static_text.h" -#include "dcpomatic_button.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "wx_util.h" +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + using std::vector; + KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector cpls) : wxPanel (parent, wxID_ANY) , _cpls (cpls) diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h index 4b461b813..720a1efe8 100644 --- a/src/wx/kdm_cpl_panel.h +++ b/src/wx/kdm_cpl_panel.h @@ -19,11 +19,11 @@ */ #include "lib/types.h" -#include "lib/warnings.h" -#include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS +#include class KDMCPLPanel : public wxPanel { diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index c7be18622..268573e6c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -34,13 +34,13 @@ #include "lib/job_manager.h" #include "lib/kdm_with_metadata.h" #include "lib/screen.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::exception; diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index 052c07f81..b475bde70 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -20,11 +20,11 @@ #include "wx_util.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index bc66e37b9..98f408135 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -31,19 +31,19 @@ #include "lib/cinema.h" #include "lib/config.h" #include "lib/send_kdm_email_job.h" -#include "lib/warnings.h" #include #include +#include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::exception; diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 829b26544..872d23a8f 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -21,11 +21,11 @@ #include "wx_util.h" #include "lib/kdm_with_metadata.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc index 998cd5a81..c5ecd1f1f 100644 --- a/src/wx/kdm_timing_panel.cc +++ b/src/wx/kdm_timing_panel.cc @@ -19,14 +19,14 @@ */ #include "kdm_timing_panel.h" -#include "wx_util.h" -#include "time_picker.h" #include "static_text.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "time_picker.h" +#include "wx_util.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; using boost::bind; diff --git a/src/wx/kdm_timing_panel.h b/src/wx/kdm_timing_panel.h index be2e9309b..7221ba722 100644 --- a/src/wx/kdm_timing_panel.h +++ b/src/wx/kdm_timing_panel.h @@ -18,10 +18,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc index 91ac3512d..df2b74976 100644 --- a/src/wx/language_tag_dialog.cc +++ b/src/wx/language_tag_dialog.cc @@ -23,12 +23,12 @@ #include "language_tag_dialog.h" #include "wx_util.h" #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS using std::vector; diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h index 0675ed88a..b9085e97a 100644 --- a/src/wx/language_tag_dialog.h +++ b/src/wx/language_tag_dialog.h @@ -23,11 +23,11 @@ #define DCPOMATIC_LANGUAGE_TAG_DIALOG_H -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class wxListCtrl; diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc index 3df2b6914..567b1fefa 100644 --- a/src/wx/language_tag_widget.cc +++ b/src/wx/language_tag_widget.cc @@ -23,10 +23,10 @@ #include "language_tag_dialog.h" #include "language_tag_widget.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using boost::optional; diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h index 422c97918..346b8bc75 100644 --- a/src/wx/language_tag_widget.h +++ b/src/wx/language_tag_widget.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc index 5d6611691..ed0b68c8f 100644 --- a/src/wx/markers_dialog.cc +++ b/src/wx/markers_dialog.cc @@ -27,11 +27,11 @@ #include "timecode.h" #include "wx_util.h" #include "lib/film.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index 7d713bd59..22af7126e 100644 --- a/src/wx/markers_dialog.h +++ b/src/wx/markers_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/message_dialog.h b/src/wx/message_dialog.h index 8ef43cf9a..3839f003d 100644 --- a/src/wx/message_dialog.h +++ b/src/wx/message_dialog.h @@ -18,10 +18,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class MessageDialog : public wxDialog { diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc index a06a3f7fc..644c0546b 100644 --- a/src/wx/metadata_dialog.cc +++ b/src/wx/metadata_dialog.cc @@ -25,14 +25,14 @@ #include "metadata_dialog.h" #include "wx_util.h" #include "lib/film.h" -#include "lib/warnings.h" -#include -#include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS +#include +#include using std::weak_ptr; diff --git a/src/wx/metadata_dialog.h b/src/wx/metadata_dialog.h index a6f5cefda..8a0ff9f44 100644 --- a/src/wx/metadata_dialog.h +++ b/src/wx/metadata_dialog.h @@ -25,11 +25,11 @@ #include "lib/change_signaller.h" #include "lib/film.h" -#include "lib/warnings.h" #include "lib/weak_film.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class Button; diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc index db6229711..4b930d5d7 100644 --- a/src/wx/move_to_dialog.cc +++ b/src/wx/move_to_dialog.cc @@ -21,10 +21,10 @@ #include "move_to_dialog.h" #include "lib/film.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc index edaf8f83f..21d1c823e 100644 --- a/src/wx/nag_dialog.cc +++ b/src/wx/nag_dialog.cc @@ -19,10 +19,10 @@ */ +#include "check_box.h" #include "nag_dialog.h" -#include "wx_util.h" #include "static_text.h" -#include "check_box.h" +#include "wx_util.h" using std::shared_ptr; diff --git a/src/wx/nag_dialog.h b/src/wx/nag_dialog.h index 11fb907f0..1552becc8 100644 --- a/src/wx/nag_dialog.h +++ b/src/wx/nag_dialog.h @@ -20,10 +20,10 @@ #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class NagDialog : public wxDialog diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc index 5460b2f22..ac3361f4c 100644 --- a/src/wx/name_format_editor.cc +++ b/src/wx/name_format_editor.cc @@ -20,8 +20,8 @@ #include "name_format_editor.h" -#include "wx_util.h" #include "static_text.h" +#include "wx_util.h" #include "lib/util.h" diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h index 596b42740..b4fe5691e 100644 --- a/src/wx/name_format_editor.h +++ b/src/wx/name_format_editor.h @@ -24,11 +24,11 @@ #include "lib/compose.hpp" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/new_dkdm_folder_dialog.cc b/src/wx/new_dkdm_folder_dialog.cc index 9408b3d0d..0178a92ad 100644 --- a/src/wx/new_dkdm_folder_dialog.cc +++ b/src/wx/new_dkdm_folder_dialog.cc @@ -18,8 +18,10 @@ */ + #include "new_dkdm_folder_dialog.h" + NewDKDMFolderDialog::NewDKDMFolderDialog (wxWindow* parent) : TableDialog (parent, _("Add DKDM folder"), 2, 1, true) { diff --git a/src/wx/new_dkdm_folder_dialog.h b/src/wx/new_dkdm_folder_dialog.h index ff99aad61..fd613b882 100644 --- a/src/wx/new_dkdm_folder_dialog.h +++ b/src/wx/new_dkdm_folder_dialog.h @@ -18,8 +18,10 @@ */ + #include "table_dialog.h" + class NewDKDMFolderDialog : public TableDialog { public: diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc index 9d29efd57..016fb2255 100644 --- a/src/wx/normal_job_view.cc +++ b/src/wx/normal_job_view.cc @@ -22,10 +22,10 @@ #include "dcpomatic_button.h" #include "normal_job_view.h" #include "lib/job.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::shared_ptr; diff --git a/src/wx/password_entry.h b/src/wx/password_entry.h index 5939e5264..f2d4f9ed0 100644 --- a/src/wx/password_entry.h +++ b/src/wx/password_entry.h @@ -18,14 +18,17 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class CheckBox; + class PasswordEntry { public: diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 8cedd12e5..be310a931 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -45,16 +45,16 @@ #include "lib/log.h" #include "lib/ratio.h" #include "lib/util.h" -#include "lib/warnings.h" #include #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/player_information.h b/src/wx/player_information.h index 0dd6c4ad0..269a9e6c7 100644 --- a/src/wx/player_information.h +++ b/src/wx/player_information.h @@ -18,14 +18,17 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class FilmViewer; + class PlayerInformation : public wxPanel { public: diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc index 0b5889c37..259375727 100644 --- a/src/wx/player_stress_tester.cc +++ b/src/wx/player_stress_tester.cc @@ -21,12 +21,12 @@ #include "controls.h" #include "player_stress_tester.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/player_stress_tester.h b/src/wx/player_stress_tester.h index c8cc14676..534cf8c76 100644 --- a/src/wx/player_stress_tester.h +++ b/src/wx/player_stress_tester.h @@ -18,16 +18,19 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include + class wxWindow; class Controls; + class Command { public: diff --git a/src/wx/playhead_to_frame_dialog.h b/src/wx/playhead_to_frame_dialog.h index 9b582ccf7..5b4d8d413 100644 --- a/src/wx/playhead_to_frame_dialog.h +++ b/src/wx/playhead_to_frame_dialog.h @@ -18,9 +18,11 @@ */ + #include "table_dialog.h" #include "timecode.h" + class PlayheadToFrameDialog : public TableDialog { public: diff --git a/src/wx/playhead_to_timecode_dialog.h b/src/wx/playhead_to_timecode_dialog.h index 15578cdbe..fedca008f 100644 --- a/src/wx/playhead_to_timecode_dialog.h +++ b/src/wx/playhead_to_timecode_dialog.h @@ -18,9 +18,11 @@ */ + #include "table_dialog.h" #include "timecode.h" + class PlayheadToTimecodeDialog : public TableDialog { public: diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 7ed5c4495..5023cad92 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -32,13 +32,13 @@ #include "lib/internet.h" #include "lib/player_video.h" #include "lib/scoped_temporary.h" -#include "lib/warnings.h" -#include #include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/wx/question_dialog.h b/src/wx/question_dialog.h index 6b99065f6..b0ad3f7b9 100644 --- a/src/wx/question_dialog.h +++ b/src/wx/question_dialog.h @@ -18,10 +18,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class QuestionDialog : public wxDialog { diff --git a/src/wx/rating_dialog.cc b/src/wx/rating_dialog.cc index 22d10813b..9c75f0d4c 100644 --- a/src/wx/rating_dialog.cc +++ b/src/wx/rating_dialog.cc @@ -22,13 +22,13 @@ #include "dcpomatic_spin_ctrl.h" #include "rating_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/wx/rating_dialog.h b/src/wx/rating_dialog.h index 77deece79..66a93305a 100644 --- a/src/wx/rating_dialog.h +++ b/src/wx/rating_dialog.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc index e833f2e36..f6e0b2cfc 100644 --- a/src/wx/recipient_dialog.cc +++ b/src/wx/recipient_dialog.cc @@ -29,11 +29,11 @@ #include "lib/util.h" #include #include -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h index a3de94d56..2ed6d3f31 100644 --- a/src/wx/recipient_dialog.h +++ b/src/wx/recipient_dialog.h @@ -23,11 +23,11 @@ #include "email_dialog.h" #include "wx_util.h" #include "lib/screen.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h index aacfccd9a..0b2a6a4b7 100644 --- a/src/wx/recipients_panel.h +++ b/src/wx/recipients_panel.h @@ -20,12 +20,12 @@ #include "lib/dkdm_recipient.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/recreate_chain_dialog.h b/src/wx/recreate_chain_dialog.h index bef0e2de6..2e19ad96b 100644 --- a/src/wx/recreate_chain_dialog.h +++ b/src/wx/recreate_chain_dialog.h @@ -21,10 +21,10 @@ #include "question_dialog.h" #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/repeat_dialog.h b/src/wx/repeat_dialog.h index d3f1d32f8..9008b2eae 100644 --- a/src/wx/repeat_dialog.h +++ b/src/wx/repeat_dialog.h @@ -18,11 +18,11 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS #include "table_dialog.h" class RepeatDialog : public TableDialog diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc index 52c1e70be..4d8df87ef 100644 --- a/src/wx/report_problem_dialog.cc +++ b/src/wx/report_problem_dialog.cc @@ -26,10 +26,10 @@ #include "lib/config.h" #include "lib/job_manager.h" #include "lib/send_problem_report_job.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::make_shared; diff --git a/src/wx/report_problem_dialog.h b/src/wx/report_problem_dialog.h index b12bece61..06a8c2ed0 100644 --- a/src/wx/report_problem_dialog.h +++ b/src/wx/report_problem_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/rgba_colour_picker.cc b/src/wx/rgba_colour_picker.cc index 731cf9539..afd13e17e 100644 --- a/src/wx/rgba_colour_picker.cc +++ b/src/wx/rgba_colour_picker.cc @@ -21,10 +21,10 @@ #include "rgba_colour_picker.h" #include "wx_util.h" #include "static_text.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour) : wxPanel (parent, wxID_ANY) diff --git a/src/wx/rgba_colour_picker.h b/src/wx/rgba_colour_picker.h index 30c81b103..39b9ff393 100644 --- a/src/wx/rgba_colour_picker.h +++ b/src/wx/rgba_colour_picker.h @@ -19,10 +19,10 @@ */ #include "lib/rgba.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class wxColourPickerCtrl; class wxSlider; diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index ecac974e2..ba456b643 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -27,13 +27,13 @@ #include "wx_util.h" #include "lib/compose.hpp" #include "lib/util.h" -#include "lib/warnings.h" +#include #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index 7d315b533..517218669 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -21,11 +21,11 @@ #include "editable_list.h" #include "lib/screen.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index f19aef680..ae730c2df 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -19,12 +19,12 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc index 157912d37..89a35803f 100644 --- a/src/wx/self_dkdm_dialog.cc +++ b/src/wx/self_dkdm_dialog.cc @@ -27,20 +27,20 @@ #include "lib/film.h" #include "lib/screen.h" #include "lib/config.h" -#include "lib/warnings.h" +#include #include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h index 151231a00..2bd9ecad0 100644 --- a/src/wx/self_dkdm_dialog.h +++ b/src/wx/self_dkdm_dialog.h @@ -20,11 +20,11 @@ #include "wx_util.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc index 6ce8f6558..6efcf993c 100644 --- a/src/wx/send_i18n_dialog.cc +++ b/src/wx/send_i18n_dialog.cc @@ -22,10 +22,10 @@ #include "i18n_hook.h" #include "send_i18n_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/wx/send_i18n_dialog.h b/src/wx/send_i18n_dialog.h index 24884bd84..4651fb811 100644 --- a/src/wx/send_i18n_dialog.h +++ b/src/wx/send_i18n_dialog.h @@ -20,10 +20,10 @@ #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class SendI18NDialog : public wxDialog diff --git a/src/wx/servers_list_dialog.cc b/src/wx/servers_list_dialog.cc index d904a2ef0..016275c88 100644 --- 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 + using std::list; using std::string; using boost::lexical_cast; + ServersListDialog::ServersListDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Encoding Servers")) { diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h index dc261ff1c..618cba65a 100644 --- a/src/wx/servers_list_dialog.h +++ b/src/wx/servers_list_dialog.h @@ -19,11 +19,11 @@ */ #include "lib/encode_server.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include class ServersListDialog : public wxDialog diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index c6a4f1e74..468546534 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -26,11 +26,11 @@ #include "lib/butler.h" #include "lib/dcpomatic_log.h" #include "lib/image.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h index cbb162023..7a48f8ef8 100644 --- a/src/wx/simple_video_view.h +++ b/src/wx/simple_video_view.h @@ -18,16 +18,18 @@ */ + #include "video_view.h" #include "lib/position.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class FilmViewer; + class SimpleVideoView : public VideoView { public: diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 0f8929cb1..54b6da0d4 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -26,12 +26,12 @@ #include "rating_dialog.h" #include "smpte_metadata_dialog.h" #include "lib/film.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::shared_ptr; diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h index ee2a9f47c..c684ef532 100644 --- a/src/wx/smpte_metadata_dialog.h +++ b/src/wx/smpte_metadata_dialog.h @@ -24,12 +24,12 @@ #include "metadata_dialog.h" #include "lib/film.h" #include "lib/weak_film.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc index cef06d29c..a2914d77b 100644 --- a/src/wx/standard_controls.cc +++ b/src/wx/standard_controls.cc @@ -21,11 +21,11 @@ #include "film_viewer.h" #include "standard_controls.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::shared_ptr; diff --git a/src/wx/static_text.h b/src/wx/static_text.h index bb9ee612c..f10d67866 100644 --- a/src/wx/static_text.h +++ b/src/wx/static_text.h @@ -20,10 +20,10 @@ #include "i18n_hook.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class StaticText : public wxStaticText, public I18NHook diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 5ae9f5da4..4203d90e6 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -30,13 +30,13 @@ #include "lib/ffmpeg_content.h" #include "lib/examine_ffmpeg_subtitles_job.h" #include "lib/job_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::dynamic_pointer_cast; diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h index 2a5b98430..f023b73ae 100644 --- a/src/wx/subtitle_appearance_dialog.h +++ b/src/wx/subtitle_appearance_dialog.h @@ -22,10 +22,10 @@ #include "timecode.h" #include "lib/change_signaller.h" #include "lib/rgba.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc index 6b0a650c7..1681dd1e3 100644 --- a/src/wx/system_font_dialog.cc +++ b/src/wx/system_font_dialog.cc @@ -21,15 +21,13 @@ #include "system_font_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -#include -using std::cout; using std::string; using boost::optional; diff --git a/src/wx/system_font_dialog.h b/src/wx/system_font_dialog.h index 59639d2b0..a342846d8 100644 --- a/src/wx/system_font_dialog.h +++ b/src/wx/system_font_dialog.h @@ -28,10 +28,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h index b05e4e343..c9eeb3ef8 100644 --- a/src/wx/table_dialog.h +++ b/src/wx/table_dialog.h @@ -21,10 +21,10 @@ #ifndef DCPOMATIC_TABLE_DIALOG_H #define DCPOMATIC_TABLE_DIALOG_H -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class TableDialog : public wxDialog { diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc index 5173cdc5a..b47c366ab 100644 --- a/src/wx/templates_dialog.cc +++ b/src/wx/templates_dialog.cc @@ -24,10 +24,10 @@ #include "templates_dialog.h" #include "wx_util.h" #include "lib/config.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/wx/templates_dialog.h b/src/wx/templates_dialog.h index 119eb42cf..e3568a08c 100644 --- a/src/wx/templates_dialog.h +++ b/src/wx/templates_dialog.h @@ -19,11 +19,11 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index a841d1654..8cb4166c1 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -45,10 +45,10 @@ #include "lib/string_text_file_decoder.h" #include "lib/subtitle_analysis.h" #include "lib/text_content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/wx/text_view.h b/src/wx/text_view.h index 24641b2ab..f8aba8ffd 100644 --- a/src/wx/text_view.h +++ b/src/wx/text_view.h @@ -19,11 +19,11 @@ */ #include "lib/content_text.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class Decoder; class FilmViewer; diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc index 614ea9424..2bc3556fd 100644 --- a/src/wx/time_picker.cc +++ b/src/wx/time_picker.cc @@ -22,11 +22,11 @@ #include "static_text.h" #include "time_picker.h" #include "wx_util.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h index 2d056a22c..50177afd3 100644 --- a/src/wx/time_picker.h +++ b/src/wx/time_picker.h @@ -18,10 +18,11 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include class wxSpinCtrl; diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index 0230d665d..f4f0af07a 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -18,14 +18,15 @@ */ + +#include "dcpomatic_button.h" #include "timecode.h" #include "wx_util.h" -#include "dcpomatic_button.h" #include "lib/util.h" -#include + using std::string; -using std::cout; + TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button) : wxPanel (parent) diff --git a/src/wx/timecode.h b/src/wx/timecode.h index 529cc2943..65b30be12 100644 --- a/src/wx/timecode.h +++ b/src/wx/timecode.h @@ -26,11 +26,11 @@ #include "wx_util.h" #include "lib/dcpomatic_time.h" #include "lib/types.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index b39a8aebe..c2c2a8552 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -38,10 +38,10 @@ #include "lib/text_content.h" #include "lib/timer.h" #include "lib/video_content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 041970d16..24c046a6a 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -23,10 +23,10 @@ #include "lib/film.h" #include "lib/rect.h" #include "lib/util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index 79c87f7e0..633110c18 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -23,10 +23,10 @@ #include "timeline_content_view.h" #include "wx_util.h" #include "lib/content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h index 7087e9641..48ca6ed79 100644 --- a/src/wx/timeline_content_view.h +++ b/src/wx/timeline_content_view.h @@ -23,13 +23,13 @@ #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H +#include "timeline_view.h" #include "lib/change_signaller.h" #include "lib/types.h" -#include "lib/warnings.h" -#include "timeline_view.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include class Content; diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 07295d46a..c7f057b1e 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -26,10 +26,10 @@ #include "lib/compose.hpp" #include "lib/cross.h" #include "lib/playlist.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index 04fc52aa1..8796f2bbf 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -20,10 +20,10 @@ #include "timeline.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class Playlist; diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc index 413fed843..7075d4b7d 100644 --- a/src/wx/timeline_labels_view.cc +++ b/src/wx/timeline_labels_view.cc @@ -21,11 +21,11 @@ #include "timeline.h" #include "timeline_labels_view.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc index 22aa998dc..331f6580d 100644 --- a/src/wx/timeline_reels_view.cc +++ b/src/wx/timeline_reels_view.cc @@ -21,10 +21,11 @@ #include "timeline.h" #include "timeline_reels_view.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::min; diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc index 722a9f30a..a57398599 100644 --- a/src/wx/timeline_text_content_view.cc +++ b/src/wx/timeline_text_content_view.cc @@ -18,12 +18,15 @@ */ + #include "timeline_text_content_view.h" #include "lib/text_content.h" #include "lib/content.h" + using std::shared_ptr; + TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr c, shared_ptr caption) : TimelineContentView (tl, c) , _caption (caption) diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc index 046ddaf3f..023b42ec7 100644 --- a/src/wx/timeline_time_axis_view.cc +++ b/src/wx/timeline_time_axis_view.cc @@ -18,14 +18,15 @@ */ + #include "timeline.h" #include "timeline_time_axis_view.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::cout; diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 31b160542..494d415ec 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -18,35 +18,35 @@ */ -#include "timing_panel.h" -#include "wx_util.h" -#include "film_viewer.h" -#include "timecode.h" + #include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" #include "move_to_dialog.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "timecode.h" +#include "timing_panel.h" +#include "wx_util.h" +#include "lib/audio_content.h" #include "lib/content.h" -#include "lib/image_content.h" -#include "lib/text_content.h" +#include "lib/dcp_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/audio_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/image_content.h" #include "lib/string_text_file_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" -#include "lib/dcp_content.h" -#include "lib/ffmpeg_content.h" #include -#include "lib/warnings.h" +#include #if defined(__WXGTK20__) && !defined(__WXGTK3__) #define TIMING_PANEL_ALIGNMENT_HACK 1 -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif #include -#include -using std::cout; + using std::string; using std::set; using std::shared_ptr; @@ -59,6 +59,7 @@ using namespace boost::placeholders; using dcp::locale_convert; using namespace dcpomatic; + TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix diff --git a/src/wx/try_unmount_dialog.cc b/src/wx/try_unmount_dialog.cc index 93ebc6240..ddfaec5c0 100644 --- a/src/wx/try_unmount_dialog.cc +++ b/src/wx/try_unmount_dialog.cc @@ -22,10 +22,10 @@ #include "static_text.h" #include "try_unmount_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS static int constexpr width = 300; diff --git a/src/wx/try_unmount_dialog.h b/src/wx/try_unmount_dialog.h index cb01a2afb..027e5e838 100644 --- a/src/wx/try_unmount_dialog.h +++ b/src/wx/try_unmount_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS class TryUnmountDialog : public wxDialog diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc index 0b4753d1b..0a7319704 100644 --- a/src/wx/update_dialog.cc +++ b/src/wx/update_dialog.cc @@ -19,13 +19,13 @@ */ -#include "update_dialog.h" #include "static_text.h" +#include "update_dialog.h" #include "wx_util.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::string; diff --git a/src/wx/update_dialog.h b/src/wx/update_dialog.h index 096699f39..138989591 100644 --- a/src/wx/update_dialog.h +++ b/src/wx/update_dialog.h @@ -18,12 +18,14 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class UpdateDialog : public wxDialog { public: diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index b76176728..8b73744f4 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -22,14 +22,14 @@ #include "verify_dcp_dialog.h" #include "wx_util.h" #include "lib/verify_dcp_job.h" -#include "lib/warnings.h" -#include #include -#include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS +#include using std::list; diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h index dc1810d12..076217b1f 100644 --- a/src/wx/verify_dcp_dialog.h +++ b/src/wx/verify_dcp_dialog.h @@ -18,17 +18,18 @@ */ + #include -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include - class wxRichTextCtrl; class VerifyDCPJob; + class VerifyDCPDialog : public wxDialog { public: diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_progress_dialog.cc index 320510c60..6c941c98d 100644 --- a/src/wx/verify_dcp_progress_dialog.cc +++ b/src/wx/verify_dcp_progress_dialog.cc @@ -24,10 +24,10 @@ #include "lib/cross.h" #include "lib/job.h" #include "lib/job_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/verify_dcp_progress_dialog.h b/src/wx/verify_dcp_progress_dialog.h index 0f1526afe..190c302ea 100644 --- a/src/wx/verify_dcp_progress_dialog.h +++ b/src/wx/verify_dcp_progress_dialog.h @@ -19,16 +19,14 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include - class Job; - class wxGauge; class wxStaticText; diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 74b2d2219..83c29611d 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -38,11 +38,11 @@ #include "lib/ratio.h" #include "lib/util.h" #include "lib/video_content.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h index 2d25f82af..e67b22ded 100644 --- a/src/wx/video_panel.h +++ b/src/wx/video_panel.h @@ -29,7 +29,6 @@ #include "timecode.h" #include "lib/film.h" - class wxButton; class wxChoice; class wxSpinCtrl; diff --git a/src/wx/video_view.h b/src/wx/video_view.h index cf5e09da0..a1cc41f07 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -28,10 +28,10 @@ #include "lib/signaller.h" #include "lib/timer.h" #include "lib/types.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index bc68fa6c2..3177f48cb 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -18,15 +18,15 @@ */ + #include "video_waveform_dialog.h" #include "video_waveform_plot.h" #include "film_viewer.h" #include "wx_util.h" #include "static_text.h" #include -#include -using std::cout; + using boost::bind; using std::weak_ptr; using std::shared_ptr; diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h index 25bd462ae..99a9a566a 100644 --- a/src/wx/video_waveform_dialog.h +++ b/src/wx/video_waveform_dialog.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include @@ -30,6 +30,7 @@ class VideoWaveformPlot; class FilmViewer; class Film; + class VideoWaveformDialog : public wxDialog { public: diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc index f45a5662e..8e3284682 100644 --- a/src/wx/video_waveform_plot.cc +++ b/src/wx/video_waveform_plot.cc @@ -26,18 +26,16 @@ #include "lib/film.h" #include "lib/image.h" #include "lib/player_video.h" -#include "lib/warnings.h" #include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -#include -using std::cout; using std::make_shared; using std::max; using std::min; diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index 36ec63d8a..362efa2ac 100644 --- a/src/wx/video_waveform_plot.h +++ b/src/wx/video_waveform_plot.h @@ -19,10 +19,10 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/wx_signal_manager.cc b/src/wx/wx_signal_manager.cc index 78a98b1d6..d26ddd4a0 100644 --- a/src/wx/wx_signal_manager.cc +++ b/src/wx/wx_signal_manager.cc @@ -18,11 +18,13 @@ */ + #include "wx_signal_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + wxSignalManager::wxSignalManager (wxEvtHandler* h) : _handler (h) diff --git a/src/wx/wx_signal_manager.h b/src/wx/wx_signal_manager.h index 7269acebf..8a94d0325 100644 --- a/src/wx/wx_signal_manager.h +++ b/src/wx/wx_signal_manager.h @@ -18,10 +18,13 @@ */ + #include "lib/signal_manager.h" + class wxEvtHandler; + /** @class wxSignalManager * @brief SignalManager for the wxWidgets event loop */ diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 493743d4a..9974f61c9 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -34,15 +34,15 @@ #include "lib/job_manager.h" #include "lib/util.h" #include "lib/version.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 06e3eda0f..14f203688 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -29,11 +29,11 @@ #include "lib/dcpomatic_time.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include diff --git a/test/stream_test.cc b/test/stream_test.cc index 25c2d98a6..fe64e147e 100644 --- a/test/stream_test.cc +++ b/test/stream_test.cc @@ -25,11 +25,11 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/ffmpeg_audio_stream.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include using std::pair; diff --git a/test/test.h b/test/test.h index 2b01db294..43bccd52b 100644 --- a/test/test.h +++ b/test/test.h @@ -19,7 +19,6 @@ */ -#include "lib/warnings.h" #include "lib/types.h" #include #include