From 89d5fe15b399eae5afad0b856f2d7b267a1c86c0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 1 Jul 2016 12:32:42 +0100 Subject: [PATCH] asdcp headers moved into subdirectory. --- cscript | 4 ++-- src/asset_reader.cc | 2 +- src/asset_writer.cc | 4 ++-- src/atmos_asset.cc | 2 +- src/certificate.cc | 2 +- src/certificate_chain.cc | 2 +- src/dcp.cc | 2 +- src/decrypted_kdm.cc | 4 ++-- src/key.cc | 6 +++--- src/metadata.cc | 2 +- src/mono_picture_asset.cc | 4 ++-- src/mono_picture_asset_reader.cc | 2 +- src/mono_picture_asset_writer.cc | 4 ++-- src/mono_picture_frame.cc | 4 ++-- src/mxf.cc | 6 +++--- src/picture_asset.cc | 4 ++-- src/picture_asset_writer.cc | 4 ++-- src/smpte_subtitle_asset.cc | 4 ++-- src/sound_asset.cc | 4 ++-- src/sound_asset_reader.cc | 2 +- src/sound_asset_writer.cc | 2 +- src/sound_frame.cc | 4 ++-- src/stereo_picture_asset.cc | 2 +- src/stereo_picture_asset_reader.cc | 2 +- src/stereo_picture_asset_writer.cc | 4 ++-- src/stereo_picture_frame.cc | 4 ++-- src/subtitle_asset.cc | 4 ++-- src/util.cc | 6 +++--- test/dcp_test.cc | 2 +- test/encryption_test.cc | 2 +- test/recovery_test.cc | 6 +++--- 31 files changed, 53 insertions(+), 53 deletions(-) diff --git a/cscript b/cscript index 956ce5f6..a89ba3bf 100644 --- a/cscript +++ b/cscript @@ -35,9 +35,9 @@ import os def dependencies(target): if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'v0.15.1'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'd2042ad')) + return (('libcxml', 'v0.15.1'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'bc41241')) else: - return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'd2042ad')) + return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'bc41241')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory diff --git a/src/asset_reader.cc b/src/asset_reader.cc index dc667787..9ada75f0 100644 --- a/src/asset_reader.cc +++ b/src/asset_reader.cc @@ -34,7 +34,7 @@ #include "asset_reader.h" #include "mxf.h" #include "exceptions.h" -#include "AS_DCP.h" +#include using namespace dcp; diff --git a/src/asset_writer.cc b/src/asset_writer.cc index c5610e5d..8ce05d5b 100644 --- a/src/asset_writer.cc +++ b/src/asset_writer.cc @@ -38,8 +38,8 @@ #include "asset_writer.h" #include "mxf.h" #include "dcp_assert.h" -#include "AS_DCP.h" -#include "KM_prng.h" +#include +#include using namespace dcp; diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc index 616739ea..a8a595c3 100644 --- a/src/atmos_asset.cc +++ b/src/atmos_asset.cc @@ -33,7 +33,7 @@ #include "atmos_asset.h" #include "exceptions.h" -#include "AS_DCP.h" +#include using std::string; using namespace dcp; diff --git a/src/certificate.cc b/src/certificate.cc index 3189c22d..18249a58 100644 --- a/src/certificate.cc +++ b/src/certificate.cc @@ -35,12 +35,12 @@ * @brief Certificate class. */ -#include "KM_util.h" #include "certificate.h" #include "compose.hpp" #include "exceptions.h" #include "util.h" #include "dcp_assert.h" +#include #include #include #include diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc index 52ecd03f..0046fe75 100644 --- a/src/certificate_chain.cc +++ b/src/certificate_chain.cc @@ -39,8 +39,8 @@ #include "exceptions.h" #include "util.h" #include "dcp_assert.h" -#include "KM_util.h" #include "compose.hpp" +#include #include #include #include diff --git a/src/dcp.cc b/src/dcp.cc index d38037e1..215c6002 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -50,12 +50,12 @@ #include "cpl.h" #include "certificate_chain.h" #include "compose.hpp" -#include "AS_DCP.h" #include "decrypted_kdm.h" #include "decrypted_kdm_key.h" #include "dcp_assert.h" #include "reel_asset.h" #include "font_asset.h" +#include #include #include #include diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index add87f3f..abe12a32 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -41,9 +41,9 @@ #include "cpl.h" #include "certificate_chain.h" #include "dcp_assert.h" -#include "AS_DCP.h" -#include "KM_util.h" #include "compose.hpp" +#include +#include #include #include #include diff --git a/src/key.cc b/src/key.cc index 4fd087d3..d2417a09 100644 --- a/src/key.cc +++ b/src/key.cc @@ -36,9 +36,9 @@ */ #include "key.h" -#include "AS_DCP.h" -#include "KM_prng.h" -#include "KM_util.h" +#include +#include +#include #include #include #include diff --git a/src/metadata.cc b/src/metadata.cc index ffe49093..0e3d7c76 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -38,7 +38,7 @@ #include "metadata.h" #include "util.h" #include "local_time.h" -#include "AS_DCP.h" +#include #include #include #include diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index 59af7c72..194d3997 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -34,12 +34,12 @@ #include "mono_picture_asset.h" #include "mono_picture_asset_writer.h" #include "mono_picture_asset_reader.h" -#include "AS_DCP.h" -#include "KM_fileio.h" #include "exceptions.h" #include "dcp_assert.h" #include "mono_picture_frame.h" #include "compose.hpp" +#include +#include using std::string; using std::vector; diff --git a/src/mono_picture_asset_reader.cc b/src/mono_picture_asset_reader.cc index 5d9ae94f..a732e020 100644 --- a/src/mono_picture_asset_reader.cc +++ b/src/mono_picture_asset_reader.cc @@ -35,7 +35,7 @@ #include "mono_picture_asset.h" #include "mono_picture_frame.h" #include "exceptions.h" -#include "AS_DCP.h" +#include using namespace dcp; using boost::shared_ptr; diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc index eba4be56..7c955c1d 100644 --- a/src/mono_picture_asset_writer.cc +++ b/src/mono_picture_asset_writer.cc @@ -35,12 +35,12 @@ * @brief MonoPictureAssetWriter class */ -#include "AS_DCP.h" -#include "KM_fileio.h" #include "mono_picture_asset_writer.h" #include "exceptions.h" #include "picture_asset.h" #include "dcp_assert.h" +#include +#include #include "picture_asset_writer_common.cc" diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 6cdcf935..fd095a1f 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -40,10 +40,10 @@ #include "util.h" #include "rgb_xyz.h" #include "colour_conversion.h" -#include "KM_fileio.h" -#include "AS_DCP.h" #include "compose.hpp" #include "j2k.h" +#include +#include using std::string; using boost::shared_ptr; diff --git a/src/mxf.cc b/src/mxf.cc index ad2b5c3e..6ec634da 100644 --- a/src/mxf.cc +++ b/src/mxf.cc @@ -36,15 +36,15 @@ */ #include "raw_convert.h" -#include "AS_DCP.h" -#include "KM_prng.h" -#include "KM_util.h" #include "mxf.h" #include "util.h" #include "metadata.h" #include "exceptions.h" #include "dcp_assert.h" #include "compose.hpp" +#include +#include +#include #include #include #include diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 338be329..674180c3 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -38,9 +38,9 @@ #include "picture_asset_writer.h" #include "dcp_assert.h" #include "compose.hpp" -#include "AS_DCP.h" -#include "KM_fileio.h" #include "j2k.h" +#include +#include #include #include #include diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index f4d66613..baa98a4f 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -31,11 +31,11 @@ files in the program, then also delete it here. */ -#include "KM_fileio.h" #include "picture_asset_writer.h" #include "exceptions.h" #include "picture_asset.h" -#include "AS_DCP.h" +#include +#include #include #include diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 2a6a5093..5bb88621 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -43,9 +43,9 @@ #include "raw_convert.h" #include "dcp_assert.h" #include "util.h" -#include "AS_DCP.h" -#include "KM_util.h" #include "compose.hpp" +#include +#include #include #include #include diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 8abaae8f..613fa576 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -42,9 +42,9 @@ #include "sound_asset_writer.h" #include "sound_asset_reader.h" #include "compose.hpp" -#include "KM_fileio.h" -#include "AS_DCP.h" #include "dcp_assert.h" +#include +#include #include #include #include diff --git a/src/sound_asset_reader.cc b/src/sound_asset_reader.cc index d98b9cc7..b656abd5 100644 --- a/src/sound_asset_reader.cc +++ b/src/sound_asset_reader.cc @@ -35,7 +35,7 @@ #include "sound_asset.h" #include "sound_frame.h" #include "exceptions.h" -#include "AS_DCP.h" +#include using boost::shared_ptr; using namespace dcp; diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index fccdda28..b0d7bc7d 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -36,7 +36,7 @@ #include "exceptions.h" #include "dcp_assert.h" #include "compose.hpp" -#include "AS_DCP.h" +#include using std::min; using std::max; diff --git a/src/sound_frame.cc b/src/sound_frame.cc index 98c4b38a..83b053b2 100644 --- a/src/sound_frame.cc +++ b/src/sound_frame.cc @@ -37,8 +37,8 @@ #include "sound_frame.h" #include "exceptions.h" -#include "AS_DCP.h" -#include "KM_fileio.h" +#include +#include using namespace std; using namespace dcp; diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index 5c3d04ff..cc197546 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -31,13 +31,13 @@ files in the program, then also delete it here. */ -#include "AS_DCP.h" #include "stereo_picture_asset.h" #include "stereo_picture_frame.h" #include "exceptions.h" #include "stereo_picture_asset_writer.h" #include "stereo_picture_asset_reader.h" #include "dcp_assert.h" +#include using std::string; using std::pair; diff --git a/src/stereo_picture_asset_reader.cc b/src/stereo_picture_asset_reader.cc index 2d1442c9..00f4e660 100644 --- a/src/stereo_picture_asset_reader.cc +++ b/src/stereo_picture_asset_reader.cc @@ -35,7 +35,7 @@ #include "stereo_picture_asset.h" #include "stereo_picture_frame.h" #include "exceptions.h" -#include "AS_DCP.h" +#include using namespace dcp; using boost::shared_ptr; diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc index 35c0b73e..d98df6ae 100644 --- a/src/stereo_picture_asset_writer.cc +++ b/src/stereo_picture_asset_writer.cc @@ -35,8 +35,8 @@ #include "exceptions.h" #include "dcp_assert.h" #include "picture_asset.h" -#include "AS_DCP.h" -#include "KM_fileio.h" +#include +#include #include "picture_asset_writer_common.cc" diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index f001c00b..82f84f3f 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -36,10 +36,10 @@ #include "util.h" #include "rgb_xyz.h" #include "colour_conversion.h" -#include "AS_DCP.h" -#include "KM_fileio.h" #include "compose.hpp" #include "j2k.h" +#include +#include using std::string; using boost::shared_ptr; diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 35ca6174..cb757673 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -39,8 +39,8 @@ #include "text_node.h" #include "subtitle_string.h" #include "dcp_assert.h" -#include "AS_DCP.h" -#include "KM_util.h" +#include +#include #include #include #include diff --git a/src/util.cc b/src/util.cc index 8c37e7e6..359ac317 100644 --- a/src/util.cc +++ b/src/util.cc @@ -42,9 +42,9 @@ #include "openjpeg_image.h" #include "dcp_assert.h" #include "compose.hpp" -#include "KM_util.h" -#include "KM_fileio.h" -#include "AS_DCP.h" +#include +#include +#include #include #include #include diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 325202f0..435056cb 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -33,7 +33,7 @@ #include "reel_stereo_picture_asset.h" #include "reel_sound_asset.h" #include "reel_atmos_asset.h" -#include "KM_util.h" +#include #include #include diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 24bd1138..a817d246 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -17,7 +17,6 @@ along with libdcp. If not, see . */ -#include "KM_util.h" #include "metadata.h" #include "certificate.h" #include "dcp.h" @@ -35,6 +34,7 @@ #include "reel_sound_asset.h" #include "encrypted_kdm.h" #include "decrypted_kdm.h" +#include #include #include #include diff --git a/test/recovery_test.cc b/test/recovery_test.cc index 8af49b93..7482b8cc 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -17,11 +17,11 @@ along with libdcp. If not, see . */ -#include -#include #include "mono_picture_asset_writer.h" #include "mono_picture_asset.h" -#include "KM_util.h" +#include +#include +#include using std::string; using boost::shared_ptr; -- 2.30.2