Move Behaviour enum out of J2KPictureAsset.

9 files changed, 15 insertions, 15 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index dbbf1e45..4647d8ae 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
 	auto mp = make_shared<dcp::StereoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
-	auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		/* Left */
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
 	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
-	auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 30b301a5..1aadc461 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto picture_asset = std::make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	picture_asset->set_key (key);
 	picture_asset->set_context_id (context_id);
-	auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData picture("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write(picture);
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index e3ff8a2d..a927a5df 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
 
-	auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 5f29ebab..331eabf1 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -67,7 +67,7 @@ check (shared_ptr<dcp::J2KPictureAssetWriter> writer, boost::random::uniform_int
 BOOST_AUTO_TEST_CASE (frame_info_hash_test)
 {
 	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = mp->start_write("build/test/frame_info_hash_test.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write("build/test/frame_info_hash_test.mxf", dcp::Behaviour::MAKE_NEW);
 
 	boost::random::mt19937 rng(1);
 	boost::random::uniform_int_distribution<> dist(0, 4095);
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index a3835d23..4b261d48 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 
 	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_key (dcp::Key());
-	auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData frame ("test/data/flat_red.j2c");
 	writer->write (frame.data(), frame.size());
 	writer->finalize ();
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index feb480bb..0e1dce11 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (recovery)
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
 	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = mp->start_write("build/test/baz/video1.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write("build/test/baz/video1.mxf", dcp::Behaviour::MAKE_NEW);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 
 	mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	writer = mp->start_write("build/test/baz/video2.mxf", dcp::J2KPictureAsset::Behaviour::OVERWRITE_EXISTING);
+	writer = mp->start_write("build/test/baz/video2.mxf", dcp::Behaviour::OVERWRITE_EXISTING);
 
 	writer->write (data.data(), data.size());
 
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 926441ab..ffba5cbd 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::create_directory (work_dir);
 
 	auto asset_A = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = asset_A->start_write(work_dir / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset_A->start_write(work_dir / "video.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
diff --git a/test/test.cc b/test/test.cc
index 56ea32cd..51a631d2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -284,7 +284,7 @@ simple_picture (boost::filesystem::path path, string suffix, int frames, optiona
 	if (key) {
 		mp->set_key (*key);
 	}
-	auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::Behaviour::MAKE_NEW);
 
 	dcp::Size const size (1998, 1080);
 	auto image = make_shared<dcp::OpenJPEGImage>(size);
@@ -533,7 +533,7 @@ black_picture_asset (boost::filesystem::path dir, int frames)
 	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel"));
 	boost::filesystem::create_directories (dir);
-	auto writer = asset->start_write(dir / "pic.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write(dir / "pic.mxf", dcp::Behaviour::MAKE_NEW);
 	for (int i = 0; i < frames; ++i) {
 		writer->write (frame.data(), frame.size());
 	}
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 47292c46..80d0490e 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1027,7 +1027,7 @@ dcp_from_frame (dcp::ArrayData const& frame, path dir)
 {
 	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	create_directories (dir);
-	auto writer = asset->start_write(dir / "pic.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write(dir / "pic.mxf", dcp::Behaviour::MAKE_NEW);
 	for (int i = 0; i < 24; ++i) {
 		writer->write (frame.data(), frame.size());
 	}
@@ -1832,7 +1832,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	} else {
 		mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	}
-	auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::Behaviour::MAKE_NEW);
 
 	auto image = black_image (dcp::Size(width, height));
 	auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
@@ -4673,7 +4673,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_key (key);
 
-	auto writer = mp->start_write(dir / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write(dir / "video.mxf", dcp::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data(), j2c.size());
@@ -5441,7 +5441,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 	boost::filesystem::create_directories(path);
 
 	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
-	auto picture_writer = mp->start_write(path / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write(path / "video.mxf", dcp::Behaviour::MAKE_NEW);
 
 	dcp::Size const size(1998, 1080);
 	auto image = make_shared<dcp::OpenJPEGImage>(size);