Use libdcp's warnings.h

diff --git a/src/lib/analytics.cc b/src/lib/analytics.cc
index 7483166bad72bc444d006dd93ac0ff4b32109a7c..75146cb45313a60211339197bd72a1c2df119c0c 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc
index cc74209e0ee8abc4f2a51fd30afca91cda0b2313..ada304dad1c698d5d167230b1f7b42ccbb6dc0ee 100644 (file)
--- a/src/lib/atmos_content.cc
+++ b/src/lib/atmos_content.cc
@@ -20,11 +20,11 @@
 
 
 #include "atmos_content.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-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 755d6e9b07e6a9488a6f51b959e56191d1597e6f..c9fc2118c13276c0f78e810c6bb52bf53b20dd3f 100644 (file)
--- 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 <dcp/warnings.h>
 extern "C" {
 #include <leqm_nrt.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libavutil/channel_layout.h>
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 #include <libavfilter/f_ebur128.h>
 #endif
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 }
 
 

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index b16fa708ad85d74bad44d134b2302745b4d8602c..721ffed07c6e28464ddb159877527c39c8d712db 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <stdint.h>
 #include <cmath>

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index aa67f5097c09d275be08865efd180aed0ce0281f..5e8bf4d04713de054caddefd383eb18167b71395 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/regex.hpp>
 #include <iostream>
 

diff --git a/src/lib/audio_point.cc b/src/lib/audio_point.cc
index abf8485e34f3dc997753a067ae1fe741872b83ba..1f32d25fce3e2e35bbb0ff193a37617ad1284613 100644 (file)
--- a/src/lib/audio_point.cc
+++ b/src/lib/audio_point.cc
@@ -20,11 +20,11 @@
 
 
 #include "audio_point.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 6cf4ed646a6b9625e269f3eed5ccfd2b6dcd8357..b0c81e91cc832d297b310098985eb0ea47bd6106 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include "util.h"
 #include <dcp/chromaticity.h>
 #include <dcp/gamma_transfer_function.h>
-#include <dcp/modified_gamma_transfer_function.h>
 #include <dcp/identity_transfer_function.h>
+#include <dcp/modified_gamma_transfer_function.h>
+#include <dcp/raw_convert.h>
 #include <dcp/s_gamut3_transfer_function.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #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> 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 9f42610bdc8acc53069467bb8ba9f1821aea7c47..d313445da906bbf3786d2130674cb3f826549720 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 14b8c71ba7bd9e23aa9425b5eaf27d1c8177ddbf..d7d1089fc8c90f2484436e30587d80eb8af00f40 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <glib.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avio.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index b11ac90ef3251fee485e81ae0ffa4ab87c5eaf37..02f720fee421835f511924874036304b6767bba9 100644 (file)
--- 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 <dcp/raw_convert.h>
 #include <glib.h>
 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 0ea5ae82132b1b8a31d93ce26bfc0d8d12aec0fe..eb243b60dbc41e652e624b5ad461dd523e6e8ecf 100644 (file)
--- 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 <dcp/cpl.h>
 #include <dcp/mxf.h>
 #include <dcp/reel.h>
@@ -28,9 +27,10 @@
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/reel_smpte_subtitle_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-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 b29d8c4894f2111e3c3bbfe005b91ef70717c13c..4b5ed4512e898b3b51aa934edb2615f5835b5971 100644 (file)
--- 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 <dcp/language_tag.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 class DCPTextTrack

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 4a41e17b9c514fe728a081d0e9f7c453fb05c76b..50d33e9d5e1cff769336d1ba7332e0f7363095fc 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k_transcode.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <stdint.h>

diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 4698c159d26a97bd9dd85cac1edd153334eacc09..532bbb314f9a4ba9aa5c089097b8cc6bceafcf91 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index cd471d171a7cd24808da05d8e36a6e6698b38740..d326c767be226aa240255504354a4ae08a33ef75 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #ifdef HAVE_VALGRIND_H

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 2a6d47a005f1d077a3bea152840a9d7a05934a56..2e0347c79dccb78bc282f7b6f42c2cbfadea3d54 100644 (file)
--- 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 <dcp/version.h>
+#include <dcp/warnings.h>
 #include <libssh/libssh.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -34,7 +34,7 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 #include "i18n.h"

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 59b2dedd5bd5d05998b67e1485f33ec33d2c2a3c..25d26e8136ad5a5d5b7cb28ee4012e1a87a8e228 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 
 

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 91020e288a4fa113856b77733304c73ddb20342d..05e1a3fc807ef0802772a6b41252fa6ead30df8d 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -21,10 +21,10 @@
 
 #include "ffmpeg_audio_stream.h"
 #include <dcp/raw_convert.h>
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
 

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 01886da7f90ce0c7bd68a8ebd4a57f36dd7f6b19..fdcacb465602693fba0bf668cc82d7bd9b82ddd6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -37,7 +37,7 @@ extern "C" {
 #include <libavutil/display.h>
 #include <libavutil/eval.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 9f3d88551266b26a184f03fa37f2d4f34e690e36..fc2b5c654217f8b9963bae8d2b6d7695da29c198 100644 (file)
--- 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 <dcp/key.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
-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 94385eabdedf5fbaa8e371530bbd7c2cd0350714..f513eef2d57cbef6dc58c243f065c797905639eb 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 2d85a90bb69fcf81bc595b2ec3f96439bb5b1de4..47f71d1195bcbb2a169b5661c31171a8bd165c11 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
-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 e500dd35b6294b91c6750ae6532ef3ae0fdddca1..1101901b7f1b20a83a192129b8361f5ce4d9cba5 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;

diff --git a/src/lib/ffmpeg_wrapper.cc b/src/lib/ffmpeg_wrapper.cc
index dbd2dce9f725a7bb3cbda6287b807f7cb89940a2..19db5414021a99dee07b640c2e96f7728a42e843 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avformat.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <new>
 
 

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8..bb48805e67b2f32d2e0e9e316857a60c49905f97 100644 (file)
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -25,13 +25,12 @@
 
 
 #include "filter.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 
 #include "i18n.h"
 

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 9ee628d4cd097fa9b2bae97e08ac793986be4261..4019b5863249e6d6b5ee9b1ea864021f025920bc 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/buffersink.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 struct AVFilterContext;

diff --git a/src/lib/font.cc b/src/lib/font.cc
index a2dc1945f009a8facb973bd5eec19d51f256e373..f750bfc88401b4a69939ea993aecf6ed35b97a0a 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 19b3ea5a8419e6634b9355d1a8b5dc5880ad6f27..4f5b11c90ba63c93dd7e8f842a6c1992f41a000b 100644 (file)
--- 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 <dcp/rgb_xyz.h>
 #include <dcp/transfer_function.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavutil/frame.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <png.h>
 #if HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 67083e6550cb314b7e9a13f166ea1486ffb26bec..269b01bca7457c65dfe0377240bb4b7fbbdc7348 100644 (file)
--- 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 <dcp/colour_conversion.h>
 #include <dcp/j2k_transcode.h>
 #include <dcp/mono_picture_frame.h>
@@ -31,10 +30,11 @@
 #include <dcp/raw_convert.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/stereo_picture_frame.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/kdm_recipient.h b/src/lib/kdm_recipient.h
index 90e9fd16dd079dc62df1e043e1d2aef71f8aaf01..f18e714290d0a530a68ba7757cf066fd70b11ed3 100644 (file)
--- 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 <dcp/certificate.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 #include <string>
 

diff --git a/src/lib/memory_util.cc b/src/lib/memory_util.cc
index bac46bb1f133470b11a754e0cbc70bd78df9ca74..00117855d4a12856f7a47cf941684585e0944db6 100644 (file)
--- a/src/lib/memory_util.cc
+++ b/src/lib/memory_util.cc
@@ -19,12 +19,12 @@
 */
 
 
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavutil/avutil.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <new>
 #include <stdexcept>
 

diff --git a/src/lib/pixel_quanta.h b/src/lib/pixel_quanta.h
index 018ce334638f1819ac56eddb541283303049144d..37d2321f45b8474caeb777e2fe3cd4247f838b2a 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-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 fb0d16df8a5b6cc29cef87a5054d85ccdc8dec5e..9b486dd5cc669966f8e600c26c24579bbcb0f4bd 100644 (file)
--- 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 <dcp/raw_convert.h>
 #include <dcp/util.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 #include "i18n.h"
 

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index 6f7614d36f5050b4bde1f9c553c59d5827110f7f..0c14b00c4e7c3881a7b45b72ffa4b39bc40c420c 100644 (file)
--- 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 <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <fontconfig/fontconfig.h>
 #include <cairomm/cairomm.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <pangomm.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <pango/pangocairo.h>
 #include <boost/algorithm/string.hpp>
 #include <iostream>

diff --git a/src/lib/rgba.cc b/src/lib/rgba.cc
index 4d2c28085eb74fa4a2dc8b8b58c45fdbf746f4e8..2e6a4fab632aa6e64c251fba52ac51f899d44dc0 100644 (file)
--- a/src/lib/rgba.cc
+++ b/src/lib/rgba.cc
@@ -20,10 +20,10 @@
 
 
 #include "rgba.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 
 

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 9c349f233084efadcd370e91001141346c71d07b..8bb41e3b1d3118aa43f453865ccc09901b1c6d93 100644 (file)
--- 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 <sys/stat.h>
 
 #include "i18n.h"
@@ -55,12 +54,12 @@ SCPUploader::SCPUploader (function<void (string)> set_status, function<void (flo
                throw NetworkError (String::compose(_("Could not connect to server %1 (%2)"), Config::instance()->tms_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 8d0dcc6fc76df26b74e702adb1a8c14e8cf7f9d9..3e5e957ff457792257e37c243add266e2feb4524 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index 878bd610f287faa16440b02906a3f641e3e751e2..f0b377a56bfe5b6d0b983f22aa293a4b39702f2a 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-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 0838816b04a823fcd8e3201da5001c6f9a41f77d..9b3ae86c065656ad71394e0b01575ed30f2af4e1 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::make_shared;

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 228ebf28f6d47bc442e12d8b4f43540c66ae1189..e9b412ded06bf2709b03601fce9fda9e6bd23325 100644 (file)
--- 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 <dcp/raw_convert.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/reel_file_asset.h>
+#include <dcp/raw_convert.h>
 #include <dcp/reel_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/reel_file_asset.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
 #include "i18n.h"

diff --git a/src/lib/util.cc b/src/lib/util.cc
index f2d35fa2f7fc04c344de5620563e02df15a94872..7106cc782fb077e48f49a619651b008e7be502ff 100644 (file)
--- 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 <dcp/atmos_asset.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/locale_convert.h>
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
 #include <dcp/picture_asset.h>
+#include <dcp/raw_convert.h>
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
-#include <dcp/atmos_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/util.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <curl/curl.h>
 #include <glib.h>
 #include <pangomm/init.h>
@@ -75,9 +75,9 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <boost/range/algorithm/replace_if.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <boost/locale.hpp>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #ifdef DCPOMATIC_WINDOWS
 #include <boost/locale.hpp>
 #include <dbghelp.h>
@@ -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 0c7e23b050b2e2b0fe6b98940616df0c83a62529..1cc1425202d190f6c5937a16fb4fd29d209bd7a1 100644 (file)
--- 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 <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>

diff --git a/src/lib/warnings.h b/src/lib/warnings.h
deleted file mode 100644 (file)
index ca8a9ab..0000000
--- a/src/lib/warnings.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#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 90c939a08308fde0bf9a0bb856e95587dbd63090..1ea9ab63b3da1715224035bc7c46bdabf1f8869f 100644 (file)
--- 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 <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/generic/aboutdlgg.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wxhtml.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 1b84ca2bc38591bc8095d5e0ad009fd03b0e3cf9..79f1b39fa0f7080efda7cef3c9759bb5f37410dd 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/aboutdlg.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 #include <set>
 

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 4a783d6346f65679d289a29035199b7401c24bc4..40587e23ad4b5f9fae1ea114fadc7ca824751d6b 100644 (file)
--- 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 <dcp/combine.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <wx/wx.h>
 #include <boost/bind/bind.hpp>
 #include <boost/filesystem.hpp>

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 1907a604522149e1b642ee84022d4ef2fea6ccb2..872850fba454ab64e02c593c68094bfd22eefc17 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -40,9 +40,9 @@
 #include "lib/warnings.h"
 #include <wx/cmdline.h>
 #include <wx/wx.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <boost/process.hpp>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #ifdef DCPOMATIC_WINDOWS
 #include <boost/process/windows.hpp>
 #endif

diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 67de360d3348bafd18c09c14e6c49ab206535645..627aacc86dea73ebb645649b1e9f7e0340abcb34 100644 (file)
--- 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 <glibmm.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 65bb921e57ae6ec05a54371410c5b5e09ab032bc..98d701fab3dc1ab92dbfb98f60dbb74e9ea5cf09 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -48,14 +48,14 @@
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/treectrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 1ab83a23079436e9d9323a84aadc65f18f3f4414..46dead8506200edf4cbf44c421de2f7b2ce8a4b5 100644 (file)
--- 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 <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
 #include <dcp/search.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/display.h>
 #include <wx/preferences.h>
@@ -71,7 +71,7 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 5bae0c4297687a37eb2958e8964966471003c9ed..bf958b9f79e3fb80aec5f5c9e459d9c652eae98c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index de25f531d733a6e8fe786dfe8b21754eb7185280..6cf0a9609d518ddfb2970627abc216286e90607e 100644 (file)
--- 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 <wx/taskbar.h>
-#include <wx/splash.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/icon.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/splash.h>
+#include <wx/taskbar.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
+
 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 37070bf0d345ac0cda22d30d7efbe9bfe0e5ea6c..e80a92d247023c602e8bc9ff1fc4916e9e9caac2 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
-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 f3bb65a6c9d95e2868b8f725ad359ead00d664b4..f9b60ccc62350651bdf9ed304d6639de46818b63 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 8ba69ec79bdee838c23da4c2035d739afc64b5a5..a202ad65b1d6be3ef0bf9c81be3cd51730b13caf 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 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 13510e9d19c6c81d42ed3c4aea3066452a978722..c16ec4cb660a6e320645a913992ec18cb8f56a6f 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <cmath>
 
 

diff --git a/src/wx/audio_gain_dialog.h b/src/wx/audio_gain_dialog.h
index 9f9c973cf6691e4a4a0b53a89cb135da8e710a9f..95c438c77a7fbe68f894b006f7a4de58ae65400f 100644 (file)
--- 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 81fa1a70d722b58bbddfd5bec4412c0302773c05..8818deb63737ad54b9492bf450701d0b7b2db636 100644 (file)
--- 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 <dcp/locale_convert.h>
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-#include <wx/renderer.h>
-#include <wx/grid.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+#include <wx/grid.h>
+#include <wx/renderer.h>
+#include <wx/wx.h>
+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 aad152a622172be69fb25d9f82adc9e542ad468e..873fc5c93800fd74d5e761165fdbd712ecb49b9f 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index cfea4f0264a5b8a55ea200e1b94de5ea11f9db89..f25af27f740f231fbbf36a961f05f422b5a198f8 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+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 0e9e815e1cce07d83c095a8be90a6ba9f864cf94..fbcd9047fbf034b717968f12b40a44f7343df939 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <cfloat>
 

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 9edabf8ec70b5cc605bfd932c07fb2b1e9083db0..b2ffd5ad52467aaf5f7ad6d63551bcdd2f95be20 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <vector>
 

diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc
index 6ce9f46806cb4fe5668b958ec03a1dd72b16dcc7..96dd801d1669128ac0358a156e1660359b3c0ac5 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/button.h>
 #include <wx/sizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 65952040aba803bc32a02a82beec353faa08f769..6e54ef4116b6cb4ca815ee792c60299c263be336 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 54536a81c3cab656360c0650edc7340c03522b32..2898bfaa916d1fa748440af58a0a69a3bed675ba 100644 (file)
--- 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 32dd77264e07e9c5b56b64ec009bfa168db93f7d..a878e605557cf7a6cf850b82f9d1ecc8728131fe 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <vector>
 

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 1f0e450ff3203bc632ec2601d898af05a57963c6..700b8922a9506073df558c9a1722d7a527048e6c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 b4cf90fe79ac72223892a093fa8346b5f35468f4..b7c054e27468d964c5a836c836b4619659cb8df6 100644 (file)
--- 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 <dcp/gamma_transfer_function.h>
 #include <dcp/identity_transfer_function.h>
 #include <dcp/locale_convert.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <dcp/s_gamut3_transfer_function.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/numformatter.h>
 #include <wx/spinctrl.h>
-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 294cdbf82627fbccaa2f2ff0c7121fa38b7b8c7b..cc3c3d225a610dbe3a80c3e33f818cd6b7d12306 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index f91ebe670244d9de702534459cc59bb99cd2dd84..08e2721da35e49f448b3d2ccabd9de93dbea9f22 100644 (file)
--- 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 <dcp/raw_convert.h>
-#include <iostream>
 
-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 eade690437e2b19456b8631ee7bd575f6ba8d593..3e71cb11ad75c75345c8e7553cc9a1a6691d3376 100644 (file)
--- 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 <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
 #include <RtAudio.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
-#include <iostream>
 
 
 class AudioMappingView;

diff --git a/src/wx/config_move_dialog.cc b/src/wx/config_move_dialog.cc
index baf55f18a9a0057c2a1b57f83ce23ed109073c7d..c9a0d7eaeca9805ad1527e850b1fa68a54a88ecf 100644 (file)
--- 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 <boost/filesystem.hpp>
 
+
 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 b7cea11559e69d5632bfa180a13b45bbf0ffc086..a84c8448cb349bf6db7a83705f1e6f577e0f4011 100644 (file)
--- a/src/wx/config_move_dialog.h
+++ b/src/wx/config_move_dialog.h
@@ -18,9 +18,11 @@
 
 */
 
+
 #include "question_dialog.h"
 #include <boost/filesystem.hpp>
 
+
 class ConfigMoveDialog : public QuestionDialog
 {
 public:

diff --git a/src/wx/confirm_kdm_email_dialog.h b/src/wx/confirm_kdm_email_dialog.h
index 7360f3513c021c8cac49a669ee757de4e1f77927..1081409370da5972a647b34a470a8ba46e5230e7 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index 5b4650141697e2172dee10866bc64534f93d1086..b860b2aad975fca3b6c5361e64bddc3d2ef03413 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
 #include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h
index 84ad4afac196b896e78151a4ecbe45a033ac53fc..1dd2b472d917a8e715bdd80a0ffeee95faf2232e 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 #include <vector>
 

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 54f56f432cb041ebeaa7d5a128afa5f22f66de18..5b5a1983c167b30d95f28a6be3db797315a689a6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/statline.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+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 ec9d374b7e7b70f937e28bbf7f023edc7b34a5e0..e42961019a0bb7cf6f8f36f0a88fbcc6605b3809 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 47f88b4910f5f62baaa64d3aa7d5b2a0863636c0..3b49a85cc3fe5575616cc56b6775d8945b7fa690 100644 (file)
--- 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 <dcp/cpl.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 #include <dcp/search.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/dirdlg.h>
 #include <wx/wx.h>
-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 dceb0effe833a4286ae05cf5b2c354716d0e5829..910afc7200f27a61d17e0a1930da8d7f12fc1b3c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index e42413d9dceb83d780e01014529af248873c7eff..f93b0d471dd09c72dcf1ef8ca8095662c81fdaa8 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/display.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 604a15fe49d575bc4470eb25905160bf732ed1d2..d6c81a8d2a794b5cf1fa9867f24c3bce379402d2 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/splitter.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 0c775287ac69ab2ec5cd8e9b03c6033a4866ccfe..4fe378bf2faec66f84dff2f2f7a97a489bc4d191 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
-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 3f8317bf9d95b295659e253d594872d847d278df..2817fab6e939c39f4653ef957ce8cbe4322692b6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 a020f81486f458fbad053f1b541727555cb997c4..f4c9aca9d62009a186b3ae3747de012438084c89 100644 (file)
--- 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 <dcp/exceptions.h>
+#include <dcp/warnings.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/progdlg.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/content_view.h b/src/wx/content_view.h
index d7c1a43ed7b971307a5fc1b5810e07e7945c4fb4..16ff5c4636f51e571e4f37907e21d93bd58501f0 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 23b409a97287d61b7768500335e7583e93f0836b..788d1449a3fa45ffc0717e41ead97077ecc68b13 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 62fec0a75b958608ed0dba1cfeb46c6522c546e4..ba069126877b95fae069125f1b46b0d3049ee333 100644 (file)
--- 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 <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/controls.h b/src/wx/controls.h
index ca9c2008759c0ad9b7a8609d41982e0f74e32b37..0341da29009febe7c8878cdaad1981d787e60d3f 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
-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 77c18e3c1ddd0459cfeeb5546f81d8c7a32db340..d90fc2719bda0d9f4a3d20905db6bf012402ae55 100644 (file)
--- 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<optional<string> ()> get_username,

diff --git a/src/wx/credentials_download_certificate_panel.h b/src/wx/credentials_download_certificate_panel.h
index b9af14f5b27a61d87fe6cb1de90083f2faaffac3..d0449e6696e65798361d972b5eb3ef5143aac7e4 100644 (file)
--- 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 48f476a9f7bbd1c368ba6f14f67978305c1a1545..e750b9baa053d60bb5628503e839c31c3ff4b5dd 100644 (file)
--- 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 <dcp/raw_convert.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using boost::optional;

diff --git a/src/wx/custom_scale_dialog.h b/src/wx/custom_scale_dialog.h
index 485b6acf5b519e4982479ccecc67cfba180bcd44..d8cecad2325205137fea9ab2c28838334fdc24c2 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CustomScaleDialog : public TableDialog

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 914068b113321bac45cee520310fd3cd703d0ccf..ab6bd22b5ab0534c764691a0edc0e8ad75c49415 100644 (file)
--- 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 <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 
 

diff --git a/src/wx/dcp_text_track_dialog.h b/src/wx/dcp_text_track_dialog.h
index c073696376c241685b566bff9ff7bd754a6eaef9..41a91b0d0125fd30fa6c30981269810f145b835c 100644 (file)
--- 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 7e0e01dc2746da41dc5190023ce5a9816e54c2ab..902c856668ae2c1b900aafafa664c31a015855d7 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/button.h>
-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 7d39721514f14ee8486faf62a9aa37edbca74ebe..70bd7e3f768e00033c6b7824f5d8d96694ae549d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <boost/version.hpp>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 
 
 #if BOOST_VERSION >= 106100

diff --git a/src/wx/dcpomatic_spin_ctrl.h b/src/wx/dcpomatic_spin_ctrl.h
index 556cf63471c599c50993c53f8773c0f1dc4f38af..4a673ff93f98b9c4a77a5afef525adfc030849fd 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-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 feb11a52702b62538d0496f84473eda5cbfb349d..6c8fdd1fc3e6b48c82505c7e4278b7c428156466 100644 (file)
--- 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 <wx/wx.h>
-#include <wx/stdpaths.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 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 34f46b2dfc4b79c99b041e695f0b6af42d9dbc68..f70168db48fa98f08be28deab3d2d34c78cb0bb5 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 class DirPickerCtrl : public wxPanel
 {
 public:

diff --git a/src/wx/disk_warning_dialog.h b/src/wx/disk_warning_dialog.h
index c690ea25d82b7658bf0a39a474685df03fb171fd..d59f334ac1d7d5d81b4c666f9bf110d932fc739b 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 5743cd71204bf079cc53fa61f952cf89e37febb3..c7503048cea80331645afb15808949ca1a1316a0 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+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 5e7f019082e37a012602840db4756c9ba82ef417..4a47d961f2a3cc487a06ac0412f3f4bd633be9d1 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <map>
 
 

diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index cf6189efa7192a961f5727a224441ef543fb9fe4..5b04f740a4a2ab3db6acf7bb70f32e9454c60cc9 100644 (file)
--- 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 <dcp/exceptions.h>
 #include <dcp/types.h>
+#include <dcp/warnings.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
-#endif
 #include <wx/stdpaths.h>
+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 9ad2a40a5f8744fa298c5cfe072ce10a52d65fae..297c318876e90eda8e275cfb0953776191a05214 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index db4cd9f6736be28cb0085385e307f83f52cb9eae..25f7392396b39000333cbdaf60f11cb781774f26 100644 (file)
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -29,10 +29,8 @@
 #include <dcp/raw_convert.h>
 #include <curl/curl.h>
 #include <zip.h>
-#include <iostream>
 
 
-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 a5085e174fe2035945958b736719ba4004425dca..12873c9443a546bcc3963980501bf90ab883b2c6 100644 (file)
--- a/src/wx/download_certificate_dialog.h
+++ b/src/wx/download_certificate_dialog.h
@@ -18,12 +18,14 @@
 
 */
 
-#include "lib/warnings.h"
+
 #include <dcp/certificate.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/notebook.h>
-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 0e7b2ab713198f6ffa5049027156874b24d94221..cfa70241ffa2be5c062daa08be8094c8e4a04b09 100644 (file)
--- 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 <dcp/warnings.h>
 #include <dcp/certificate.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/drive_wipe_warning_dialog.cc b/src/wx/drive_wipe_warning_dialog.cc
index 23e007a05302dc1091ba2ab4aa95f7e87c4f39ff..094a1ddede904765e1ef5506130a468442eed03f 100644 (file)
--- 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 71a21b55f2408d312e442641d785a0418c96d4e2..7e6266d315bcad4a8e4ed0cef3545b8e1a7c3747 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 6bf7f7b628421d3937b8771997af70036940081e..56c3a946379cedfa99ef19da832327eda7597291 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/export_subtitles_dialog.cc b/src/wx/export_subtitles_dialog.cc
index 3fc5dcdb27ef22b2f66f4a2445d962bd664ee4c4..cb9629a1863945f7c6d69290f89c35fd534c0b2f 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h
index c53df820ef1a6630178591643b87d40a5c73a2ae..db614f667b9df8241ffb240c41c2f97a8d3581e3 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 76731bdf58ad38b351541310e3e4267945270f29..50ea5ca485d15c81fea9afd172a298faf6f25632 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
+
 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 0c93965ad6f15b84db51f52f13ebd6145ca3b076..578585362bd94f0c81bc559b56aa719787a583df 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 3eb05e44dcd966226fe2d0d582e41dfabfb980cc..284f7bc99336d93dd9ad80a5c6fbc3e4c181d04c 100644 (file)
--- 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 <wx/wx.h>
-#include <wx/stdpaths.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 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 60858b665da55983d1a06fe83e9139dc53126833..df7226655ecbb75fd69b47b97a514aea4b678923 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 d7493ad6346a9f92e289620de918e99a76a3c511..47fb469707fdeab4255663ba199209f631864d52 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6aff127d8a6cfe4156a478e8a971220aad133fae..61557ce1c53c7231f753fb4c429f17bcdfa17448 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index e6a31190190a790893553ac99c3c79b83add3316..2f3fefe49aa0c2033fc2903e4e4c1092d2bef9fe 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h
index 29fcd338495e3fc832bf845148cd49630e37d73a..a659ab22f2f925ab351fc28af7f9dd72cfa311a2 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 class DirPickerCtrl;

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 8cff277f30ed64aec900c2a8575539fe959124d5..34ff8dbc46fbfab9dd92d3c555da34d2abc1d1f5 100644 (file)
--- 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 <dcp/exceptions.h>
+#include <dcp/warnings.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iomanip>
 
 

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0569131ea300fedf58a6daa621a5fc5bf0fbd1f7..2373af122bb387ccffc289111442c416fab0f470 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <RtAudio.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h
index 33f92c0a69ae7204b3b43b5f04523c70d79ea75b..44dbb502dd1856e3247f533b5ce193454441523a 100644 (file)
--- a/src/wx/filter_dialog.h
+++ b/src/wx/filter_dialog.h
@@ -24,10 +24,10 @@
  */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc
index b530f7481634c5c8cd14d032e2969fe07f189918..9f1aa7df883895ede05dd3deca7cd33e18cd65c4 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/textctrl.h>
-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 3c91c22fa616d006da53dfdda99b34abd2c6ddbe..337d877398bde393a36ce5649d9f0983d9c2687b 100644 (file)
--- a/src/wx/focus_manager.h
+++ b/src/wx/focus_manager.h
@@ -18,11 +18,14 @@
 
 */
 
+
 #include <boost/signals2.hpp>
 
+
 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 668d8798b000bb9105cc02ee26ae3cd71c57e3f9..e81f4a853cd094a2ae8e71bde5a04fb91212dc74 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 

diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h
index b62ba381747bfa2bd274295956e64c33dbbc9f60..612971031bebe7473ea9a196a7e7a105792512f1 100644 (file)
--- a/src/wx/fonts_dialog.h
+++ b/src/wx/fonts_dialog.h
@@ -19,11 +19,11 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <memory>
 

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 3b9955beaedfc5961a01dffd9e2ee93ed99184cc..c13ec7ed0c8b678259566326466d87c00f16e3dd 100644 (file)
--- 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 <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 #include <iostream>

diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index 19e52ff140eb813f758fb6bfbdc52be1e52c3adc..f597e82f783648b72f5535118a66007b488746fe 100644 (file)
--- 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 <dcp/language_tag.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>

diff --git a/src/wx/full_language_tag_dialog.h b/src/wx/full_language_tag_dialog.h
index 1d4c4ac10f1c90eac126380b095dec519a49dfef..99f1c3267fc7650578131accb739f9ddfaa6ca7b 100644 (file)
--- 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 <dcp/language_tag.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 41312cdca1519b4f814e99033fc6b90ae28ede60..e0d545660f85997f7eaeba7c23b35b50110e4d7d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/gdc_certificate_panel.h b/src/wx/gdc_certificate_panel.h
index e41254e4512750dadb102b04581e7da8f2f06953..6e2e3303b3a220c9043052e3fb2b0fdbacaefabe 100644 (file)
--- 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 e64cb63db642e445daae664944ccb0cfeb3427de..70c81ea79e4bbeb72ce67d16c07ac5186a4cf7f7 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
 #include <wx/wx.h>
-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 2ab28fa6ca7d44b6b98d7d8c19b5a596577666ce..05baf19ff335fb513336d5f5ab4adf67bdd93b70 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::max;

diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 37d36459cab6a734af0755f8e7bec4e9a6d463f3..1c77faf3eb9c814cf9b7eb7e5d187a2162ff227a 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc
index dcae84cd9d3b4b834e58a54bbf0c7138d34a84c9..824d4fabcea713f676631eee32f7ed04febbee0f 100644 (file)
--- 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 <boost/filesystem.hpp>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wxhtml.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/fs_mem.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+#include <wx/wxhtml.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/filesystem.hpp>
 
 
 #if BOOST_VERSION >= 106100

diff --git a/src/wx/html_dialog.h b/src/wx/html_dialog.h
index 2b6924179b8c8252cad5d63cfa3f35477e287e89..1792d86edbfa524d2a87f2cb3c2d5ef9dc927216 100644 (file)
--- a/src/wx/html_dialog.h
+++ b/src/wx/html_dialog.h
@@ -19,10 +19,10 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxHtmlLinkEvent;

diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc
index 15b9c1024c322bf731a39cba86b085a3647400ae..eb6e61d5fb2bb19768d344c23008cd71a9061b1d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/i18n_hook.h b/src/wx/i18n_hook.h
index bb1bc822799f124f09fe2971ea42efbb705fadee..50c020b2a33219aaaa2539c697a4de338bbc4c05 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <map>
 
 

diff --git a/src/wx/image_sequence_dialog.h b/src/wx/image_sequence_dialog.h
index 1a7ae5de796f3255649f6139358288e90f7f4729..d554ea908a0cb5413aa747454644c8d11be224bd 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 418a1145db939b50e746f8ae67858f1ff23f615c..ee7f94f4cef17ecb3a3153ba97175e22d49e824e 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 08626c0ed7707d9390c5b14c8770381889e93d16..515127b84b39700b7c715eb54c770f9f0766ad0e 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-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 fc1f9381dc7e5d5a1fc1edffda4f1c33c8553710..1d7a5a6eb848736f3ad6d618ecae3abff4cf7af6 100644 (file)
--- 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 <dcp/language_tag.h>
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index e960bc2f667a33e2c291fd79dffb3fbe9ac0ce18..c1a1744bf69aae6deab0d9b9230f3c5c13f054f5 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <memory>
 

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index d4243cfb1128478ebb2a8f4e8c190bb2fbd43c00..5a6484f0a3a237e7b62b106efed24df9d1dcf6d0 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 

diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc
index 1ae145e664a58c9358947ab6979f848e3b47e02f..c3ec8a6f3e2480a8ac4ba4057a6e5929c58dee6d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using boost::optional;

diff --git a/src/wx/kdm_choice.h b/src/wx/kdm_choice.h
index 8b216924a23f04590fd08fe21c098175aa25be62..11b0b631490e3251022c5c08a73973d6a9f554ee 100644 (file)
--- a/src/wx/kdm_choice.h
+++ b/src/wx/kdm_choice.h
@@ -19,11 +19,11 @@
 */
 
 
-#include "lib/warnings.h"
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 f45fc529164f7ef760ebc39979335a13d067982f..b1bbc1cf01d6d711aef38f0665f6a146474d3be3 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
+
 using std::vector;
 
+
 KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
        : wxPanel (parent, wxID_ANY)
        , _cpls (cpls)

diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h
index 4b461b8139e78795dc4d42ffbf9f9f3b1da5a536..720a1efe85007d1779f80de170959db4ba0cba81 100644 (file)
--- 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 <boost/filesystem.hpp>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <boost/filesystem.hpp>
 
 class KDMCPLPanel : public wxPanel
 {

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index c7be1862256c3c79ba974a083fbbafdd78d53304..268573e6c35e5048699961279b59c87f806ee022 100644 (file)
--- 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 <libcxml/cxml.h>
 #include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::exception;

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 052c07f8130042f807208e504170f363d075903f..b475bde7098d184f68874eec8a972d636137d845 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index bc66e37b95e098467061aa48a6d551712f2965ce..98f40813514a7a38e4061fad8188bf040046b6b3 100644 (file)
--- 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 <dcp/exceptions.h>
 #include <dcp/types.h>
+#include <dcp/warnings.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #endif
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
-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 829b26544a679bc8a303b752e21965da7bf180ba..872d23a8f9f6afe38d4b15e33d43ee42386dab65 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 998cd5a812c5158f0aa3a7f4701db1ddd2f65d2c..c5ecd1f1f46ed663d03eaca624e759aa1302e89b 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
-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 be2e9309b660ca06afe34791fc9c99d3df29b3ef..7221ba722f367eb40d47641af9d72c12fa63ab7b 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/signals2.hpp>
 

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 91ac3512dfa96a1fb0d993d89e6cf53389a10a27..df2b74976649d2d90aa951f8e8ea5d359e6290df 100644 (file)
--- 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 <dcp/language_tag.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <dcp/language_tag.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::vector;

diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h
index 0675ed88a247214bffbbd8c62f6d8bc54a524dfd..b9085e97afa4cbb5276382c675a4230f5e56f7f6 100644 (file)
--- 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 <dcp/language_tag.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 3df2b6914a7963e5ccded2e21a2adb7fc93f8eed..567b1fefab15b31eb935e6bdd50ae571addec84c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 422c97918c876df4a570f8794a461d23344aa53e..346b8bc752df11d9fefbb94a1441a6a5c03a031e 100644 (file)
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -19,11 +19,11 @@
 */
 
 
-#include "lib/warnings.h"
 #include <dcp/language_tag.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 5d66116914247ab6b59d46b8b5e241a2a4718ce4..ed0b68c8fdae4ce288d935d22e6092537d824939 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h
index 7d713bd59fbf4f60ff723c1399de7b333b7877c7..22af7126e29d348d1559b6cb3bd38a02020e8809 100644 (file)
--- a/src/wx/markers_dialog.h
+++ b/src/wx/markers_dialog.h
@@ -19,10 +19,10 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <memory>
 

diff --git a/src/wx/message_dialog.h b/src/wx/message_dialog.h
index 8ef43cf9a7ba7c28f90fd4057d6a048953255c89..3839f003d8b140dc7c517c34e5bfea68f3434d69 100644 (file)
--- a/src/wx/message_dialog.h
+++ b/src/wx/message_dialog.h
@@ -18,10 +18,12 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 a06a3f7fc42939f5919843fbe579ab02e507114d..644c0546b0de6681dab0d4ea1ec7c6461216062b 100644 (file)
--- 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 <boost/bind.hpp>
-#include <boost/weak_ptr.hpp>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <boost/bind.hpp>
+#include <boost/weak_ptr.hpp>
 
 
 using std::weak_ptr;

diff --git a/src/wx/metadata_dialog.h b/src/wx/metadata_dialog.h
index a6f5cefda10d0449d0070450c1c052e841b433cd..8a0ff9f440583dc134a581f511117c981d1e5af1 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 db62297119ce28b7794552d295c781292de3d15a..4b930d5d75e53ac949ec44d75d12989789233c29 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index edaf8f83f6a41f97d0da29b7ae6d422be5478d3b..21d1c823e0bb949a758b6463d8662c87195166a7 100644 (file)
--- 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 11fb907f067c4dd0e55a4a3e4b697396fb7c7b86..1552becc8be132e4920b7ddeb5996ee8a257a949 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 5460b2f22625872472c6f6340fbee9fd8a370bc9..ac3361f4c3bb1123ca4c145210dc94d91b3388df 100644 (file)
--- 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 596b427409c2447ec621a80d66abe3b8906d62d3..b4fe5691ea08b8bfa47d40f81fb55d5764cd88d7 100644 (file)
--- 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 <dcp/name_format.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/new_dkdm_folder_dialog.cc b/src/wx/new_dkdm_folder_dialog.cc
index 9408b3d0de5247b3525b4e5b224761dae6b540df..0178a92adeab2956595cc8db8036182a1602761e 100644 (file)
--- 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 ff99aad61cc031eccf591900d1268f557bb543d3..fd613b8827887e5a559d501810923754f9bdb8a0 100644 (file)
--- 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 9d29efd578a8f313e28412e3b7e030dc7d624002..016fb225559b3d56175f011995f388252616e600 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 5939e5264ec31b3dab288c21acb4bcb889907b56..f2d4f9ed098ba970a9a73102736db6ca309631b1 100644 (file)
--- a/src/wx/password_entry.h
+++ b/src/wx/password_entry.h
@@ -18,14 +18,17 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 class CheckBox;
 
+
 class PasswordEntry
 {
 public:

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 8cedd12e5fe84af5a7590921c5e262437702dd00..be310a93170cf488a2bfd21f3a97bd880ed897b9 100644 (file)
--- 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 <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 

diff --git a/src/wx/player_information.h b/src/wx/player_information.h
index 0dd6c4ad0e8f9c41f584b90ca43d729afc291dc2..269a9e6c7357555167fc6f7c6e585fbaeacf799a 100644 (file)
--- a/src/wx/player_information.h
+++ b/src/wx/player_information.h
@@ -18,14 +18,17 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/scoped_ptr.hpp>
 
+
 class FilmViewer;
 
+
 class PlayerInformation : public wxPanel
 {
 public:

diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc
index 0b5889c37a294bc117465b9bb8f8c9ea1be0f4b0..2593757270a075f10f1c4b4788d23c9ec9705249 100644 (file)
--- 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 <dcp/raw_convert.h>
 #include <dcp/util.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <iostream>

diff --git a/src/wx/player_stress_tester.h b/src/wx/player_stress_tester.h
index c8cc14676a3f8f87b0b06cba96519a8f1912a9ec..534cf8c764bb4ffe52d666b9df9333388eb8577f 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 
+
 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 9b582ccf71c94b2c7465a5fa791fc9b3933d7cbd..5b4d8d4134f40ed0b4891a9430d7bf661b0dbaef 100644 (file)
--- 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 15578cdbe84578f10274fdecdb26df14bcbdb291..fedca008f3afbf789765d60b44efe4f711b42005 100644 (file)
--- 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 7ed5c44952a92a7c61710c9c6e1701d0889609bc..5023cad929e51898cacda40883c8e46aad83b0b9 100644 (file)
--- 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 <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/question_dialog.h b/src/wx/question_dialog.h
index 6b99065f632b05a224d990dde62978ee2810b600..b0ad3f7b9f2f714e7f5ebf3d6a7bc089e7faf381 100644 (file)
--- a/src/wx/question_dialog.h
+++ b/src/wx/question_dialog.h
@@ -18,10 +18,12 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 22d10813b4917db7d0beab06f7c8b6fd7dd02c42..9c75f0d4cacf8d53bcdd6c408f1583332391891b 100644 (file)
--- 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 <dcp/warnings.h>
 #include <unicode/unistr.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/srchctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/rating_dialog.h b/src/wx/rating_dialog.h
index 77deece79410eb4402276e8f689fc0c6f11ec395..66a93305a865df091352a95cfedc1f44feb77331 100644 (file)
--- a/src/wx/rating_dialog.h
+++ b/src/wx/rating_dialog.h
@@ -19,11 +19,11 @@
 */
 
 
-#include "lib/warnings.h"
 #include <dcp/rating.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index e833f2e36362dd80ec3aca030380cbd45cc6e94a..f6e0b2cfc60928d28c09cb6e483c4ee6852b6fed 100644 (file)
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -29,11 +29,11 @@
 #include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h
index a3de94d56da0778a8f43aa736f6597c6f20139b0..2ed6d3f31f1591ee2a4d283cce446fb8de3c47e9 100644 (file)
--- 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 <dcp/certificate.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index aacfccd9a90b96cc2695f3326b85c8a0390f8935..0b2a6a4b7aa9752d3ec29e7afd9318236852bbb8 100644 (file)
--- 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 <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>

diff --git a/src/wx/recreate_chain_dialog.h b/src/wx/recreate_chain_dialog.h
index bef0e2de615a6e8ace0b0504e8c9807cd087f8cd..2e19ad96b520cf03281552994120dd06c11554de 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/repeat_dialog.h b/src/wx/repeat_dialog.h
index d3f1d32f86fcb73938f1b3b8622dc6a06077c870..9008b2eaeedf654ca7ee113c1638dd73a45f03f2 100644 (file)
--- a/src/wx/repeat_dialog.h
+++ b/src/wx/repeat_dialog.h
@@ -18,11 +18,11 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+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 52c1e70bed2ae63c3124a17fdef366b9b175da38..4d8df87efe0351c8370ea990757e699405d886b3 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/sizer.h>
-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 b12bece618508505962ef001458bfea7533a6672..06a8c2ed03fc32cead2c5a5f8268f1fca70c21b8 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/dialog.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 

diff --git a/src/wx/rgba_colour_picker.cc b/src/wx/rgba_colour_picker.cc
index 731cf95396181cc9ef72814ee56f9533c903b3e5..afd13e17e2fc8612c280dcd88517bdbaecd8752a 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/clrpicker.h>
-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 30c81b103b107dc78d039ac1a24a0562b4ff20c5..39b9ff393af3b3f66cd87cbb5f242a8bd6ec33b7 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 ecac974e2dc5aa0cacdbebbfe9f17df2f9600283..ba456b643c2585b68a13cdaadb5567ef451f86c0 100644 (file)
--- 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 <dcp/warnings.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 7d315b5333286a9aebb1ab8e4258d501895616a6..51721866972bb2779152f130be3a9c2e98935937 100644 (file)
--- 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 <dcp/certificate.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index f19aef68000ac08b34526945ee1851c18fe7f9c8..ae730c2df4c43caecd6a79ab9b00a65d3cfff38f 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,12 +19,12 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>

diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index 157912d37af21f0525b53165966f6b4993af12fb..89a35803f22e131a82ea787595ce874267e0394a 100644 (file)
--- 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 <dcp/warnings.h>
 #include <libcxml/cxml.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #endif
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/treectrl.h>
 #include <wx/listctrl.h>
 #include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h
index 151231a002bad0a1d7e2c2ec18eaafe5767991fe..2bd9ecad05c3bed98b7ad51df1137999fb102be3 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 

diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
index 6ce8f655852493c94da36bc16efe86649fbf78df..6efcf993c714c887cb476623e18828cb6ed9a8a4 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-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 24884bd849b9a8c2c95d45a7b3c19c4a14227386..4651fb811060dca622cd6e99fad9e9ae64ef9ff6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 d904a2ef08d394e54c3c8647feec83a740d29aaa..016275c88f18e20dd18b70f2e7025bcca4b37c19 100644 (file)
--- a/src/wx/servers_list_dialog.cc
+++ b/src/wx/servers_list_dialog.cc
@@ -18,16 +18,19 @@
 
 */
 
+
 #include "servers_list_dialog.h"
 #include "wx_util.h"
 #include "lib/encode_server_finder.h"
 #include "lib/encode_server_description.h"
 #include <boost/lexical_cast.hpp>
 
+
 using std::list;
 using std::string;
 using boost::lexical_cast;
 
+
 ServersListDialog::ServersListDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Encoding Servers"))
 {

diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h
index dc261ff1c8e718de348017b7170ccfa06e597db6..618cba65aa5809c5bb799c80bc50ae46b65d1656 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class ServersListDialog : public wxDialog

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index c6a4f1e74816cd8ec7c43bc5774677206e70adf2..46854653485e5b6643a85ad056f60ff64d5e6012 100644 (file)
--- 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 <dcp/util.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index cbb162023c29e402bb0561b0570a62cc0b8a38b7..7a48f8ef839344c452bfae50f77785a08d737e0f 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 0f8929cb1d5c09a125853a7692969190438df432..54b6da0d4651de53968774b6542c04ecd7c2ae73 100644 (file)
--- 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 <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
-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 ee2a9f47c9477c5dc47c2309f335348cd5e7c570..c684ef5328845c815b24ac6aa7c950103ddcf28d 100644 (file)
--- 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 <dcp/language_tag.h>
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index cef06d29cf695c1af92e8e9e1255b2fc7ac2b2f0..a2914d77ba0727f866bf1b874e63e9babd2b50a2 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
-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 bb9ee612c5708b6e273efca4a64b89ae26bfe8a4..f10d67866c507515100cae5550f9f0e1fb5fef6c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 5ae9f5da4d8d66c3cf444f98096313ecec6007a3..4203d90e6db4d4a0965f67da17eb7971afb8bbb5 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
 #include <wx/spinctrl.h>
 #include <wx/gbsizer.h>
-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 2a5b9843023cd182201cf9318321fe81d9a9e437..f023b73ae0987b76f46ec8e5e76a2f020fdc04f5 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc
index 6b0a650c7ac426819ad2076122bf16eae1700cb1..1681dd1e3744f5e485bc3bc829acef6094e20ba6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
-#include <iostream>
 
 
-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 59639d2b0b95cb0fa7d8c12517f35fee39d7550e..a342846d89aff73853c6269586996f1dcfe80804 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <vector>

diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h
index b05e4e3436e4ee82b220ba4182bf562d614867b0..c9eeb3ef86ae8ae17fab6e36789ea3daf1442f2e 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 5173cdc5a2557921c03476ad832e6d46cee82fc1..b47c366abeb6e0610541749b34fd78a4e4b91bd6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/templates_dialog.h b/src/wx/templates_dialog.h
index 119eb42cf0d38fd400f534d3f78f8de26d68adc6..e3568a08c14de671198afeb17cc4656ccc4f163e 100644 (file)
--- a/src/wx/templates_dialog.h
+++ b/src/wx/templates_dialog.h
@@ -19,11 +19,11 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index a841d1654db52f9175f8b2263a9b125c7b9e57aa..8cb4166c11bd7f51446ba961c87f3468499f4151 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 24641b2ab856d9d7b89f8e502fe32cceee477091..f8aba8ffd23a893793e56b467a9e226e8a52c5e6 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-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 614ea94240f9a0b56d58d6082dac8fe847dcb240..2bc3556fd237757d2dbd51de6a9132d0613be2b9 100644 (file)
--- 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 <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iomanip>
 

diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 2d056a22c78739842847c918fa7e4f3e57732cc0..50177afd3e49a78c4f719828a37682d35b2eabca 100644 (file)
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -18,10 +18,11 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxSpinCtrl;

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 0230d665d10cc8bc29cf917ab280522255f75311..f4f0af07a5b33023c33707d420912eaa08472dca 100644 (file)
--- 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 <iostream>
+
 
 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 529cc2943b4f03bbbae694dcdf993ed834ee553e..65b30be123d34007d6fea268f8bbdf26b1a0107e 100644 (file)
--- 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 <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index b39a8aebef53319622d17a8efb88cd1ebffe4dbf..c2c2a8552d6a0edf2806b770dff84b45699d383d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iterator>
 #include <list>
 

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 041970d1639f2ce66dabe54c0ad8cf23e40b7718..24c046a6a2faaabebb85400972fcb339ff0e36fe 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 79c87f7e000532ce55849bb248cba69a0294efaa..633110c18f9e0d55accdf2fde9770a8ab745e242 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-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 7087e9641b62cd7073792cfa97441ff89b0fabd8..48ca6ed79e49a94731f6887bdb52f9a121511622 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Content;

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 07295d46a582a3a21acb172529562687da65e9d2..c7f057b1ebfacd286aa38cb6ed519a0bfa918803 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 04fc52aa10ab0fd376fe27c0712b150c776b5158..8796f2bbfc41add263dfb0ca328d960e95527053 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 413fed843cda042381bb02eb35252a1b050ada38..7075d4b7dce74418bfa264cc0ad007a57c9b271c 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
-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 22aa998dc96032e34de471b1661877f500dce9b7..331f6580df9ff4ce6bb0258e02d1449a4209cfc3 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
-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 722a9f30a30e45cce7628bda6eaff1f727f8eace..a57398599d4392d00296d40deeccd479aa7f7531 100644 (file)
--- 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<Content> c, shared_ptr<TextContent> 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 046ddaf3f2b301f7f4495cc2dd18e7d451465d34..023b42ec79ed4342958d9fec4605ac6424475ba0 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 31b1605421c6258e25a2de8bf6a6bb744d1eb40e..494d415eca1742b10cddd0cbb16d6ab77026aeb5 100644 (file)
--- 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 <dcp/locale_convert.h>
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
 #if defined(__WXGTK20__) && !defined(__WXGTK3__)
 #define TIMING_PANEL_ALIGNMENT_HACK 1
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <gtk/gtk.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #endif
 #include <set>
-#include <iostream>
 
-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<FilmViewer> 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 93ebc624046f401bc5586f448b28ea028556fa60..ddfaec5c09f60470d58a8f924f9ab26952c208c0 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 cb01a2afbb8eb307f69bce875065c4faf0efbd52..027e5e838f375001dcc2f3f11b6197b04600c312 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 0b4753d1b6e769ced154f65db86b93534317eb38..0a7319704e6581af1fe54ff5fb4dd271cfaa1bcd 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/hyperlink.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/update_dialog.h b/src/wx/update_dialog.h
index 096699f39df3c0e6a741b9ad32d2c658fcdbeae8..1389895911bb5dcb183b3b30f713776572dc6fad 100644 (file)
--- a/src/wx/update_dialog.h
+++ b/src/wx/update_dialog.h
@@ -18,12 +18,14 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class UpdateDialog : public wxDialog
 {
 public:

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index b761767284d66426bdaa54fc6eb204fe13dd88a6..8b73744f4c59efb151637857f576bf61c285c5ed 100644 (file)
--- 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 <dcp/verify.h>
 #include <dcp/raw_convert.h>
-#include <boost/algorithm/string.hpp>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/verify.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
 #include <wx/notebook.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <boost/algorithm/string.hpp>
 
 
 using std::list;

diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h
index dc1810d125a42bdcc5725e29d0a91c3ffba608f9..076217b1f9678c4db79698b252f87414f016421c 100644 (file)
--- a/src/wx/verify_dcp_dialog.h
+++ b/src/wx/verify_dcp_dialog.h
@@ -18,17 +18,18 @@
 
 */
 
+
 #include <dcp/verify.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <map>
 
-
 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 320510c600adf89a0272e35184088822807673bb..6c941c98d333c450426bfef6d8de37a0814af474 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/evtloop.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <string>
 
 

diff --git a/src/wx/verify_dcp_progress_dialog.h b/src/wx/verify_dcp_progress_dialog.h
index 0f1526afe21b0be3c6f032bf9298d18f8402aca2..190c302ea45fb25ebf24d8fc06fc18da37ea0043 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
-
 class Job;
 
-
 class wxGauge;
 class wxStaticText;
 

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 74b2d22192925be9df1447d9ff77bbd80f5f1095..83c29611d74c6a9acc6ac62a395be0c573809edf 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/tglbtn.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_set.hpp>
 #include <set>

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 2d25f82af4483b3e14522a356cdc4d49111b5420..e67b22deda0944bff89837c21acbb49c005d5292 100644 (file)
--- 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 cf5e09da0a8ff9444a05839cc6bce12ad4cbe5f9..a1cc41f072d88f6df06ad60648dbb8e33c30c37a 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index bc68fa6c2efe95e6b51729988533efded801ae48..3177f48cb9009aff7ac5703035ac66b23524fe39 100644 (file)
--- 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 <boost/bind/bind.hpp>
-#include <iostream>
 
-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 25bd462aee991422e89647215eea69e9fb358b45..99a9a566acdc5b1541881188658a57959e27544d 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 
@@ -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 f45a5662e9fee87c072952e8864fcad362c5b382..8e3284682485833dc7395c65b75e1c1edeb3be14 100644 (file)
--- 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 <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/rawbmp.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
-#include <iostream>
 
 
-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 36ec63d8a55bbe6b9d10052e7ec3630dd84c267e..362efa2acae5b535724c843ddbe4e9359b2d9b2e 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/wx_signal_manager.cc b/src/wx/wx_signal_manager.cc
index 78a98b1d60e036bd433acb9399f3ac45e4479fba..d26ddd4a03cf53151372135597c6f686bd87c2c1 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-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 7269acebf8d7dff2983e744f8ead8f1affcc7b32..8a94d0325eef1feae931a20581b4d6e4e8e7a9df 100644 (file)
--- 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 493743d4afebb92eb7d64e8b562fa60f0ed4795d..9974f61c983900e997e673da953afbe2bc1f60fe 100644 (file)
--- 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 <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
 #include <wx/progdlg.h>
 #include <wx/filepicker.h>
 #include <wx/sizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 06e3eda0f1b447d090c7d6350c55463a3b928f2a..14f203688668a7aa2a424bf909f279e12884a5d9 100644 (file)
--- 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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 25c2d98a689bf8a06a4e73af1bc289ae2079b55b..fe64e147e3b8b48eeb2e24a33a70cbc02c8e86cc 100644 (file)
--- 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 <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/test/unit_test.hpp>
 
 using std::pair;

diff --git a/test/test.h b/test/test.h
index 2b01db294286743dbca0a2631ff72c6f8174be5a..43bccd52b775b8791ae75e097cb9a75e0ed44730 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -19,7 +19,6 @@
 */
 
 
-#include "lib/warnings.h"
 #include "lib/types.h"
 #include <dcp/verify.h>
 #include <boost/filesystem.hpp>