Rename classes to follow preparatory renames in libdcp.

11 files changed, 38 insertions, 38 deletions

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 8d7dcd143..9d25287b2 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -39,9 +39,9 @@
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_mono_picture_asset.h>
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 837362e84..e62bd70ba 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -37,7 +37,7 @@
 #include "lib/text_content.h"
 #include "lib/text_decoder.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -327,7 +327,7 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 		});
 
-	dcp::MonoPictureAsset burnt(dcp_file(film, "j2c_"));
+	dcp::MonoJ2KPictureAsset burnt(dcp_file(film, "j2c_"));
 	auto frame = burnt.start_read()->get_frame(12)->xyz_image();
 	auto const size = frame->size();
 	int max_X = 0;
diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index cb5fcb430..9bef93d67 100644
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -30,8 +30,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 63c611831..01b71a05e 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -33,8 +33,8 @@
 #include "lib/video_content.h"
 #include "lib/ratio.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -94,8 +94,8 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 		false
 		);
 
-	auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d/original.mxf");
-	auto B = make_shared<dcp::MonoPictureAsset>(video);
+	auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d/original.mxf");
+	auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
 		false
 		);
 
-	auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
-	auto B = make_shared<dcp::StereoPictureAsset>(video);
+	auto A = make_shared<dcp::StereoJ2KPictureAsset>("build/test/recover_test_3d/original.mxf");
+	auto B = make_shared<dcp::StereoJ2KPictureAsset>(video);
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -181,9 +181,9 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
 		false
 		);
 
-	auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
+	auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
 	A->set_key (film->key ());
-	auto B = make_shared<dcp::MonoPictureAsset>(video);
+	auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
 	B->set_key (film->key ());
 
 	dcp::EqualityOptions eq;
diff --git a/test/remake_video_test.cc b/test/remake_video_test.cc
index a07659844..2afe90b63 100644
--- a/test/remake_video_test.cc
+++ b/test/remake_video_test.cc
@@ -26,7 +26,7 @@
 #include <dcp/colour_conversion.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(remake_video_after_yub_rgb_matrix_changed)
 		BOOST_REQUIRE(!cpl->reels().empty());
 		auto reel = cpl->reels()[0];
 		BOOST_REQUIRE(reel->main_picture());
-		auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(reel->main_picture()->asset());
+		auto mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel->main_picture()->asset());
 		BOOST_REQUIRE(mono);
 		auto reader = mono->start_read();
 
diff --git a/test/test.cc b/test/test.cc
index 4064f9b0e..64a48b714 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,8 +47,8 @@
 #include <dcp/dcp.h>
 #include <dcp/equality_options.h>
 #include <dcp/filesystem.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -829,10 +829,10 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 {
 	dcp::DCP dcp (dcp_dir);
 	dcp.read ();
-	auto asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
+	auto asset = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
 	BOOST_REQUIRE (asset);
 	auto frame = asset->start_read()->get_frame(index);
-	dcp::MonoPictureFrame ref_frame(ref);
+	dcp::MonoJ2KPictureFrame ref_frame(ref);
 
 	auto image = frame->xyz_image ();
 	auto ref_image = ref_frame.xyz_image();
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 78d74add4..38b8f36d4 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -42,8 +42,8 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -330,10 +330,10 @@ BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("th
 
 	BOOST_REQUIRE_EQUAL(matches.size(), 1U);
 
-	auto stereo = dcp::StereoPictureAsset(matches[0]);
+	auto stereo = dcp::StereoJ2KPictureAsset(matches[0]);
 	auto stereo_reader = stereo.start_read();
 
-	auto mono = dcp::MonoPictureAsset(dcp_file(film, "j2c"));
+	auto mono = dcp::MonoJ2KPictureAsset(dcp_file(film, "j2c"));
 	auto mono_reader = mono.start_read();
 
 	BOOST_REQUIRE_EQUAL(stereo.intrinsic_duration(), mono.intrinsic_duration());
diff --git a/test/torture_test.cc b/test/torture_test.cc
index 8e6a516bd..e5ce694ce 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -35,8 +35,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	auto reel_picture = reels.front()->main_picture();
 	BOOST_REQUIRE (reel_picture);
-	auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset> (reel_picture->asset());
+	auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel_picture->asset());
 	BOOST_REQUIRE (picture);
 	BOOST_CHECK_EQUAL (picture->intrinsic_duration(), 144);
 
diff --git a/test/vf_test.cc b/test/vf_test.cc
index ca987b22d..051712deb 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -40,8 +40,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/picture_asset_writer.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/j2k_picture_asset_writer.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
@@ -492,8 +492,8 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 	dcp::DCP ov(path / "ov");
 
 	auto make_picture = [path](string filename) {
-		auto pic = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
-		auto writer = pic->start_write(path / "ov" / filename, dcp::PictureAsset::Behaviour::MAKE_NEW);
+		auto pic = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+		auto writer = pic->start_write(path / "ov" / filename, dcp::Behaviour::MAKE_NEW);
 		auto frame = dcp::ArrayData("test/data/picture.j2c");
 		for (int i = 0; i < 240; ++i) {
 			writer->write(frame);
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 0ff2c4732..c8e939861 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -45,8 +45,8 @@
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -275,7 +275,7 @@ pixel_range (boost::filesystem::path dcp_path)
 	dcp::DCP dcp (dcp_path);
 	dcp.read ();
 
-	auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
+	auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
 	BOOST_REQUIRE (picture);
 	auto frame = picture->start_read()->get_frame(0)->xyz_image();
 
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index f3766e4af..819706803 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -33,7 +33,7 @@
 #include "lib/video_mxf_content.h"
 #include "test.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -70,9 +70,9 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 			dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K
 		});
 
-	auto ref = make_shared<dcp::MonoPictureAsset>(ref_mxf);
+	auto ref = make_shared<dcp::MonoJ2KPictureAsset>(ref_mxf);
 	boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
-	auto comp = make_shared<dcp::MonoPictureAsset>(*i);
+	auto comp = make_shared<dcp::MonoJ2KPictureAsset>(*i);
 	dcp::EqualityOptions op;
 	BOOST_CHECK (ref->equals (comp, op, note));
 }