asdcp headers moved into subdirectory.

diff --git a/cscript b/cscript
index 956ce5f6d1372a663b5994dd862b3c0f38f08094..a89ba3bf02a6d9fcee8df664c157381030312b8a 100644 (file)
--- 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 dc667787f8a61b8e5b1704b02704e88b4d057579..9ada75f0431647d31f9a76623587bcba4b20e414 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using namespace dcp;
 

diff --git a/src/asset_writer.cc b/src/asset_writer.cc
index c5610e5dd8ccc84f0e0ae42c03a734616bb90324..8ce05d5b2b536ec4045c9c6f50961c8aa789a9bd 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
 
 using namespace dcp;
 

diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc
index 616739ea8332e50d7258fb4becf91d68c514f372..a8a595c3465c228cc2ea125a0a72e454aea994d0 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using std::string;
 using namespace dcp;

diff --git a/src/certificate.cc b/src/certificate.cc
index 3189c22db5cfbd66fee557d70c48c9511b0238fb..18249a58aa26595f1ffcbd29e69424ce8a77128e 100644 (file)
--- 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 <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>

diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index 52ecd03ff13a89d20b08636aed1c92691f063844..0046fe757e07eaf453be3320b2790ee524474f8a 100644 (file)
--- 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 <asdcp/KM_util.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <xmlsec/xmldsig.h>

diff --git a/src/dcp.cc b/src/dcp.cc
index d38037e1a2bd7f17c95b2f61e774217e540ba606..215c6002cf1b2a3da9b4d26c5d50a0929af8edb1 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
 #include <libxml++/libxml++.h>

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index add87f3f506647aae2d6ab2ad2466c50474056fa..abe12a324da2f837e095913ba4d92c2c05db7ad7 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_util.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>

diff --git a/src/key.cc b/src/key.cc
index 4fd087d31fcba8eba0d341f25f86c05eb750e8ea..d2417a0956901387c450d3b6a2ee5a6bdac738a2 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <sstream>
 #include <string>
 #include <iomanip>

diff --git a/src/metadata.cc b/src/metadata.cc
index ffe49093bd5b0cb6137a16f1781d479bab596515..0e3d7c764c134b5e41f13c198fb5bc304c7f27db 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 #include <sstream>
 #include <iomanip>
 #include <time.h>

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 59af7c7299c6c9eb68701118aa7c340865c85c82..194d3997ce2d3142466476a7643055d280709292 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 using std::string;
 using std::vector;

diff --git a/src/mono_picture_asset_reader.cc b/src/mono_picture_asset_reader.cc
index 5d9ae94f20a4be94efd7e3551c8f297e5bd79ea8..a732e020e81f57da1c593a572cd18b047a9f279c 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using namespace dcp;
 using boost::shared_ptr;

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index eba4be564e3bb861f7cf6600f5996be5e7499183..7c955c1d8fc0d91b46d997083e0aa29dd3bd1942 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 #include "picture_asset_writer_common.cc"
 

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 6cdcf935fea7837a7d8c88151703a041e818185c..fd095a1fdf5e8953461b1959811beda3737ca74a 100644 (file)
--- 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 <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 
 using std::string;
 using boost::shared_ptr;

diff --git a/src/mxf.cc b/src/mxf.cc
index ad2b5c3ed916d6c6083db6397b16110bcf6c981a..6ec634da053adb94121349d10ec042d23676ddf7 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 338be329b429a5c65400396bccd0523affb45dad..674180c37b8969c673015d970077a50fa44936b7 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <list>

diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index f4d666137ad9db3ddfdf9a70580ddd0fb5124a92..baa98a4f0549d2c6a1f75a528f371430eeb4ba9d 100644 (file)
--- 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 <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 #include <inttypes.h>
 #include <stdint.h>
 

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 2a6a50933ddad09c8f441006340d3508a2a5141d..5bb88621d8611658f2ba5ff6323d083ebd5840d6 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 8abaae8fdd5c00bb1646bfbc25bb96d7ded601c3..613fa57635344d00672d2f3fda5d7be1a037b00b 100644 (file)
--- 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 <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>

diff --git a/src/sound_asset_reader.cc b/src/sound_asset_reader.cc
index d98b9cc7421ef6332ab565f7a93eebedcb32fc7c..b656abd5bfae4f41728c88fc35ecb07b4590488f 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using boost::shared_ptr;
 using namespace dcp;

diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index fccdda2814a2e8fc64df514b5eafe0d525a0dd86..b0d7bc7d98e9492f97ce3393ec4df9db77b03074 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using std::min;
 using std::max;

diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index 98c4b38a3c043ef6636d36b26367cff18581f342..83b053b2c92efdc85b5a7503487fc012dc4ab60e 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 using namespace std;
 using namespace dcp;

diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index 5c3d04ffebbb046cbb08ae87b4bfed1f1583e772..cc197546e225da4e8c0e6af23f4384a74e73d0f7 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using std::string;
 using std::pair;

diff --git a/src/stereo_picture_asset_reader.cc b/src/stereo_picture_asset_reader.cc
index 2d1442c9f4dadbb19d6494a98f2a2b2626405f89..00f4e6606c1fecd5999c6320a9de91737ae9e9e0 100644 (file)
--- 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 <asdcp/AS_DCP.h>
 
 using namespace dcp;
 using boost::shared_ptr;

diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 35c0b73ef723d2a6f6a0177002bbc5cd07c7f208..d98df6ae3d7983191f535f84b391be56e136efec 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 #include "picture_asset_writer_common.cc"
 

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index f001c00bd99b8953641882c5314fd03174ae53e8..82f84f3f97489ebdc2b437c90601567b10e2699b 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 using std::string;
 using boost::shared_ptr;

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 35ca6174672069e05512d5ed8b919adcc0f0c4cd..cb75767390d8fb0cdb8de3c268773027036ba4e7 100644 (file)
--- 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 <asdcp/AS_DCP.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/shared_array.hpp>

diff --git a/src/util.cc b/src/util.cc
index 8c37e7e6ee5254b57a0969b7bc17deb3a930f577..359ac317142de7e2c33130c48cddfe2929646f4b 100644 (file)
--- 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 <asdcp/KM_util.h>
+#include <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/dl.h>
 #include <xmlsec/app.h>

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 325202f020c7f61c6e0b8d06e2c5b0a23d81abb6..435056cb392550ab786e8284c4ab7a0c71093680 100644 (file)
--- 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 <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 24bd1138a445bb1c3f3ace7d28cc3daf7b0fcac1..a817d24606b0a04ae084e23c4a99823bd39ee882 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -17,7 +17,6 @@
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 8af49b93a249be943d25f023c6aa70f7f2687e67..7482b8cc94a1f8074acaec609066eb9899d89e6b 100644 (file)
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -17,11 +17,11 @@
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset.h"
-#include "KM_util.h"
+#include <asdcp/KM_util.h>
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
 
 using std::string;
 using boost::shared_ptr;