Fix includes.

sed -i "s/#include \"stereo_picture_asset_writer.h\"/#include \"stereo_j2k_picture_asset_writer.h\""/g src/*.{cc,h}
sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} examples/*.cc
sed -i "s/#include \"stereo_picture_asset_reader.h\"/#include \"stereo_j2k_picture_asset_reader.h\""/g src/*.{cc,h}
sed -i "s/#include \"mono_picture_asset_reader.h\"/#include \"mono_j2k_picture_asset_reader.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"stereo_picture_asset.h\"/#include \"stereo_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} examples/*.cc
sed -i "s/#include \"picture_asset_writer.h\"/#include \"j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc
sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc tools/*.cc
sed -i "s/#include \"picture_asset.h\"/#include \"j2k_picture_asset.h\""/g src/*.{cc,h} tools/*.cc
sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc tools/*.cc
sed -i "s/#include \"mono_picture_frame.h\"/#include \"mono_j2k_picture_frame.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"stereo_picture_frame.h\"/#include \"stereo_j2k_picture_frame.h\""/g src/*.{cc,h}
sed -i "s/#include \"picture_asset_writer_common.cc\"/#include \"j2k_picture_asset_writer_common.cc\""/g src/*.{cc,h}

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index 6e0961a58cef69c8f94f7708358d038595b6715b..fd1aa6bc3c4bf9e35da382eb4e66b03734ed76b6 100644 (file)
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -33,8 +33,8 @@
 
 #include "dcp.h"
 #include "cpl.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "reel.h"

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index f099409f81996acc5349349aac7478243b2ebe0c..ee18b8b055bad1acb85f7c42cc9085da099f19ea 100644 (file)
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -27,10 +27,10 @@
 #include "cpl.h"
 #include "reel.h"
 #include "reel_picture_asset.h"
-#include "mono_picture_frame.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "stereo_picture_asset.h"
+#include "mono_j2k_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "stereo_j2k_picture_asset.h"
 #include "sound_asset.h"
 #include "subtitle_asset.h"
 #include "openjpeg_image.h"

diff --git a/src/asset_factory.cc b/src/asset_factory.cc
index 9eb42c8b35d00d9bd805c669b95053f278ad0e26..19ee460e9812d59e8c6e1e0235428b18ee2cd350 100644 (file)
--- a/src/asset_factory.cc
+++ b/src/asset_factory.cc
@@ -40,11 +40,11 @@
 #include "asset_factory.h"
 #include "atmos_asset.h"
 #include "compose.hpp"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include <memory>
 
 

diff --git a/src/dcp.cc b/src/dcp.cc
index 7b238b9713a2b77a7e914652255e08c669f21fcf..dac205478a6628cf32077cc39dd15286dedd9fea 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -51,15 +51,15 @@
 #include "font_asset.h"
 #include "interop_subtitle_asset.h"
 #include "metadata.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "pkl.h"
 #include "raw_convert.h"
 #include "reel_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "util.h"
 #include "verify.h"
 #include "warnings.h"

diff --git a/src/j2k_picture_asset.cc b/src/j2k_picture_asset.cc
index c9f669a6554ce78c7bc4b587db927e777f5ad83a..5b4bed20f1dfc05be876344f37b36e0742cc0b5b 100644 (file)
--- a/src/j2k_picture_asset.cc
+++ b/src/j2k_picture_asset.cc
@@ -43,8 +43,8 @@
 #include "exceptions.h"
 #include "j2k_transcode.h"
 #include "openjpeg_image.h"
-#include "picture_asset.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>

diff --git a/src/j2k_picture_asset_writer.cc b/src/j2k_picture_asset_writer.cc
index c30be1bc4f35a78d033ac46f7b93a645db5feeba..594eb6a4eb05bd9c610038f1bc47c1798c58a42c 100644 (file)
--- a/src/j2k_picture_asset_writer.cc
+++ b/src/j2k_picture_asset_writer.cc
@@ -37,9 +37,9 @@
  */
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "exceptions.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 #include <inttypes.h>

diff --git a/src/mono_j2k_picture_asset.cc b/src/mono_j2k_picture_asset.cc
index 9a0beb42458f0aa472006a54c5e677515c4e6ab3..7fd0f2776f6088c670102d4ac4cd9bc789679d1b 100644 (file)
--- a/src/mono_j2k_picture_asset.cc
+++ b/src/mono_j2k_picture_asset.cc
@@ -42,10 +42,10 @@
 #include "equality_options.h"
 #include "exceptions.h"
 #include "filesystem.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_frame.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 

diff --git a/src/mono_j2k_picture_asset.h b/src/mono_j2k_picture_asset.h
index 9658dcf644bd8d70b6b144edb043559c7e82f8d3..255ee0a07d7cb35ad15cf05bb9646fae5225ece9 100644 (file)
--- a/src/mono_j2k_picture_asset.h
+++ b/src/mono_j2k_picture_asset.h
@@ -41,8 +41,8 @@
 #define LIBDCP_MONO_PICTURE_ASSET_H
 
 
-#include "picture_asset.h"
-#include "mono_picture_asset_reader.h"
+#include "j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
 
 
 namespace dcp {

diff --git a/src/mono_j2k_picture_asset_reader.h b/src/mono_j2k_picture_asset_reader.h
index 5bead791f9ffb6445b33b2f5e29ea4d04f688336..79c44d3613ed7f6a481f5fb498e02c9b83c1ae1d 100644 (file)
--- a/src/mono_j2k_picture_asset_reader.h
+++ b/src/mono_j2k_picture_asset_reader.h
@@ -42,7 +42,7 @@
 
 
 #include "asset_reader.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 
 
 namespace dcp {

diff --git a/src/mono_j2k_picture_asset_writer.cc b/src/mono_j2k_picture_asset_writer.cc
index 7fd58114e737e1d0c5d58cc1e9fd6463458d8b9c..81fb88ca0f77df172e7fe5ec3db618da72751901 100644 (file)
--- a/src/mono_j2k_picture_asset_writer.cc
+++ b/src/mono_j2k_picture_asset_writer.cc
@@ -40,8 +40,8 @@
 #include "crypto_context.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
-#include "mono_picture_asset_writer.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "j2k_picture_asset.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
@@ -49,7 +49,7 @@ LIBDCP_DISABLE_WARNINGS
 LIBDCP_ENABLE_WARNINGS
 
 
-#include "picture_asset_writer_common.cc"
+#include "j2k_picture_asset_writer_common.cc"
 
 
 using std::string;

diff --git a/src/mono_j2k_picture_asset_writer.h b/src/mono_j2k_picture_asset_writer.h
index 551d8c804eaeb1dea966b7b58cff5bd493ddad09..6e653f5489e885ce444e2c2678efff687a9cd95a 100644 (file)
--- a/src/mono_j2k_picture_asset_writer.h
+++ b/src/mono_j2k_picture_asset_writer.h
@@ -41,7 +41,7 @@
 #define LIBDCP_MONO_PICTURE_ASSET_WRITER_H
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include <memory>
 #include <boost/utility.hpp>
 #include <stdint.h>

diff --git a/src/mono_j2k_picture_frame.cc b/src/mono_j2k_picture_frame.cc
index 2abd57e453248d68bb916ea513163fa3f559e85e..dfdb05a72b5accc37793c951b100ad2ebe380091 100644 (file)
--- a/src/mono_j2k_picture_frame.cc
+++ b/src/mono_j2k_picture_frame.cc
@@ -44,7 +44,7 @@
 #include "file.h"
 #include "filesystem.h"
 #include "j2k_transcode.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 #include "rgb_xyz.h"
 #include "util.h"
 #include <asdcp/KM_fileio.h>

diff --git a/src/reel.cc b/src/reel.cc
index def3a4ae6a18104f9860e79367286f49e9838b51..fc47239d4aec2015d5e93f215c26e0947c600ccf 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -41,8 +41,8 @@
 #include "decrypted_kdm_key.h"
 #include "equality_options.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "reel.h"
 #include "reel_atmos_asset.h"
 #include "reel_closed_caption_asset.h"
@@ -57,7 +57,7 @@
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "subtitle_asset.h"
 #include "util.h"
 #include <libxml++/nodes/element.h>

diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc
index 9c44ec20a5e75c30ccab3715747e83336c1f77df..25f76d2f2c2b2d85adf5a1508f24af4cf1600259 100644 (file)
--- a/src/reel_mono_picture_asset.cc
+++ b/src/reel_mono_picture_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "reel_mono_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include <libcxml/cxml.h>
 
 

diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index fb2dff70a4af693912204f3f90222a121774fb6a..b03b691dc2eb2e07b41c06e61c8603dcad9d3e64 100644 (file)
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 
 
 namespace dcp {

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 7ee5fa38fe5c2ef3d1b4b6c123ffbd434942be39..e2e13067e0d624cc805a7128a697bc82c1195591 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -39,7 +39,7 @@
 
 #include "compose.hpp"
 #include "dcp_assert.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "raw_convert.h"
 #include "reel_picture_asset.h"
 #include "warnings.h"

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index ebfef74492ef25f178c2a6321c15c883b579e393..0c1670457a1ee924f32c91708a4d98aa093b02e0 100644 (file)
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_file_asset.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 
 
 namespace dcp {

diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index 5bf4756c6e0970f5567467664299824c416ca60b..ec3f77862b76fa47e32cd7543e4bc5ac86082e62 100644 (file)
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "reel_stereo_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include <libcxml/cxml.h>
 
 

diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index 7cac1c8b01bbf5c72a7158ebb4956a9c3c0329ec..7a836164a0f598dfc446230ab0e4595985616840 100644 (file)
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 
 
 namespace dcp {

diff --git a/src/stereo_j2k_picture_asset.cc b/src/stereo_j2k_picture_asset.cc
index 687d8572aab3dfddedfd7d3f22a16be59d1d993f..ffce0f51a0cb1dc05f2687a0e3b470bc0a3d355e 100644 (file)
--- a/src/stereo_j2k_picture_asset.cc
+++ b/src/stereo_j2k_picture_asset.cc
@@ -41,10 +41,10 @@
 #include "equality_options.h"
 #include "exceptions.h"
 #include "filesystem.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_asset_reader.h"
-#include "stereo_picture_asset_writer.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset_reader.h"
+#include "stereo_j2k_picture_asset_writer.h"
+#include "stereo_j2k_picture_frame.h"
 #include <asdcp/AS_DCP.h>
 
 

diff --git a/src/stereo_j2k_picture_asset.h b/src/stereo_j2k_picture_asset.h
index 6ee1d423dd992767abb73412e76a095f2b4d7b37..42d1754282d90088d75bc5447ece6106035ff351 100644 (file)
--- a/src/stereo_j2k_picture_asset.h
+++ b/src/stereo_j2k_picture_asset.h
@@ -41,8 +41,8 @@
 #define LIBDCP_STEREO_PICTURE_ASSET_H
 
 
-#include "picture_asset.h"
-#include "stereo_picture_asset_reader.h"
+#include "j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset_reader.h"
 
 
 namespace dcp {

diff --git a/src/stereo_j2k_picture_asset_reader.h b/src/stereo_j2k_picture_asset_reader.h
index 9cb052639d578916ec5760777adc29aa9ea5caa3..1ed769ac1ed8005f1a120d22c2248700458a3a89 100644 (file)
--- a/src/stereo_j2k_picture_asset_reader.h
+++ b/src/stereo_j2k_picture_asset_reader.h
@@ -42,7 +42,7 @@
 
 
 #include "asset_reader.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_frame.h"
 
 
 namespace dcp {

diff --git a/src/stereo_j2k_picture_asset_writer.cc b/src/stereo_j2k_picture_asset_writer.cc
index 6ee271bcdd572655fab69e3e5ed0c523630b7107..4f8fb6562d49bffa3563048d0aca31562fbdad11 100644 (file)
--- a/src/stereo_j2k_picture_asset_writer.cc
+++ b/src/stereo_j2k_picture_asset_writer.cc
@@ -37,16 +37,16 @@
  */
 
 
-#include "stereo_picture_asset_writer.h"
+#include "stereo_j2k_picture_asset_writer.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
 
-#include "picture_asset_writer_common.cc"
+#include "j2k_picture_asset_writer_common.cc"
 
 
 using std::string;

diff --git a/src/stereo_j2k_picture_asset_writer.h b/src/stereo_j2k_picture_asset_writer.h
index 1cee12028ce4b00a652c8c65e5a64dbca77b2f33..606f789a93469363989904c0b82f932f93ccc57b 100644 (file)
--- a/src/stereo_j2k_picture_asset_writer.h
+++ b/src/stereo_j2k_picture_asset_writer.h
@@ -37,7 +37,7 @@
  */
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include <memory>
 #include <stdint.h>
 #include <string>

diff --git a/src/stereo_j2k_picture_frame.cc b/src/stereo_j2k_picture_frame.cc
index 8d3a2757359b6325c09309436e667eab51845b98..fc98a673f17b3e8f5fde1f3373e2a436f47f50f0 100644 (file)
--- a/src/stereo_j2k_picture_frame.cc
+++ b/src/stereo_j2k_picture_frame.cc
@@ -43,7 +43,7 @@
 #include "exceptions.h"
 #include "j2k_transcode.h"
 #include "rgb_xyz.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_frame.h"
 #include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>

diff --git a/src/verify.cc b/src/verify.cc
index cfcce04f0e64114d1312698f05003b5c38781aae..9103546dc72d8538b253ee166636afde30ae7593 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -43,8 +43,8 @@
 #include "exceptions.h"
 #include "filesystem.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_frame.h"
 #include "raw_convert.h"
 #include "reel.h"
 #include "reel_closed_caption_asset.h"
@@ -55,8 +55,8 @@
 #include "reel_smpte_subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_frame.h"
 #include "verify.h"
 #include "verify_j2k.h"
 #include <libxml/parserInternals.h>

diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 0ecc87e0239cb6890f7421bee4b8ea5691551fa0..39d9c483363405b52dcdccbe92dac40cd5f846f0 100644 (file)
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -33,7 +33,7 @@
 
 
 #include "cpl.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "warnings.h"
 #include <libcxml/cxml.h>

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 5456092c9838ae1844adebb1c85a84230a15037e..feb7f51d8ddb79e4f54d1a86bca13766924296cb 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -38,8 +38,8 @@
 #include "dcp.h"
 #include "equality_options.h"
 #include "metadata.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_atmos_asset.h"
 #include "reel_markers_asset.h"
@@ -49,7 +49,7 @@
 #include "reel_stereo_picture_asset.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "test.h"
 #include <asdcp/KM_util.h>
 #include <sndfile.h>

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 8f3dbff711295205cbe7c407f5d73ba137aef108..3d858028bb69eacb4c577f5f2dae783359bf2ce2 100644 (file)
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -36,11 +36,11 @@
 #include "dcp.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "mono_j2k_picture_frame.h"
 #include "openjpeg_image.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_file_asset.h"
 #include "reel_mono_picture_asset.h"

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 358a3fd96fc7a67c855b5c49a8114de931b906f5..6e145056127223288d0237b912a617233fc6c6b7 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -37,8 +37,8 @@
 #include "certificate_chain.h"
 #include "cpl.h"
 #include "filesystem.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "sound_asset_writer.h"
 #include "sound_asset.h"
 #include "reel.h"

diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index c8bdb3e85750d2c85fdc6d0080adccddd7188cb1..943368674fe02ff7faf6e6954e1ed3c540af5d10 100644 (file)
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -33,8 +33,8 @@
 
 
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "openjpeg_image.h"
 #include <boost/random.hpp>
 #include <boost/test/unit_test.hpp>

diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 6f06b4c96ba41025674ff049343895accf822a8c..5eae90c37b5ec0eae12366c4a4c128f8203fb9ab 100644 (file)
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -36,8 +36,8 @@
 #include "cpl.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index eaf34f815f31285649ea3459ee56c565643a7aad..b968c86f669593b74322d49dee3df3f5d038221c 100644 (file)
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -32,8 +32,8 @@
 */
 
 
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
 #include "test.h"
 #include <asdcp/KM_util.h>
 #include <boost/filesystem.hpp>

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 028accbe19f649d9727de62eb2751c0b343c6527..02b9f78e4ae521de057c547ced61ea62fbeb3cf7 100644 (file)
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -35,15 +35,15 @@
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
 #include "certificate_chain.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "sound_asset.h"
 #include "reel.h"
 #include "test.h"
 #include "cpl.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 #include "certificate_chain.h"
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_asset_reader.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "openjpeg_image.h"

diff --git a/test/test.cc b/test/test.cc
index bf0e9b0397d0d28aea61b72c01f9a76e164cd1ae..efe02209cb6067cb3dc6dee30bbfe1d99023aad0 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -39,11 +39,11 @@
 #include "interop_subtitle_asset.h"
 #include "file.h"
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "openjpeg_image.h"
-#include "picture_asset_writer.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_asset.h"
 #include "reel_interop_closed_caption_asset.h"

diff --git a/test/verify_test.cc b/test/verify_test.cc
index 30e2e5e74700b57ede08c192e5e840a2992dc8fe..d9e88ec139ddbe4b536abbc7a38f7309c3fb32ab 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -38,8 +38,8 @@
 #include "file.h"
 #include "interop_subtitle_asset.h"
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "openjpeg_image.h"
 #include "raw_convert.h"
 #include "reel.h"
@@ -52,7 +52,7 @@
 #include "reel_smpte_closed_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "stream_operators.h"
 #include "test.h"
 #include "util.h"

diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 451a4d3477b546cba679e64a8f48e0e3faa45f76..5285756a0f6cc2b8331a6567b8b61ac2acac5adb 100644 (file)
--- a/tools/dcpdecryptmxf.cc
+++ b/tools/dcpdecryptmxf.cc
@@ -41,8 +41,8 @@
 #include "encrypted_kdm.h"
 #include "exceptions.h"
 #include "key.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "util.h"

diff --git a/tools/dcpdumpimage.cc b/tools/dcpdumpimage.cc
index 728e42c7a97008c77af98a05355ffeb79b96c4c4..c57857b20506693ab49fac9b8c248fd62d9891f3 100644 (file)
--- a/tools/dcpdumpimage.cc
+++ b/tools/dcpdumpimage.cc
@@ -35,7 +35,7 @@
 #include "colour_conversion.h"
 #include "cpl.h"
 #include "dcp.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "openjpeg_image.h"
 #include "reel_picture_asset.h"
 #include "raw_convert.h"

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index e812afe40775161afc2c1370a951bb4b56ea2b92..7e65d0d61c94edaf73f6b53cbc64631e9c1a2780 100644 (file)
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -41,8 +41,8 @@
 #include "exceptions.h"
 #include "filesystem.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"