diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-17 22:16:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-17 22:16:05 +0000 |
| commit | 9fd79fb05fa47833ed431d83d73fd6d9a4a9f774 (patch) | |
| tree | ce80b7905738eb342536f48ebb1712ad0f47ab1f /test/round_trip_test.cc | |
| parent | f389d903e967f44a5d6eed60df48bd5a89994bb2 (diff) | |
Asset -> MXF in some cases.
Diffstat (limited to 'test/round_trip_test.cc')
| -rw-r--r-- | test/round_trip_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 51edf111..0e6fe5f5 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -22,8 +22,8 @@ #include "certificates.h" #include "kdm.h" #include "signer.h" -#include "mono_picture_asset.h" -#include "sound_asset.h" +#include "mono_picture_mxf.h" +#include "sound_mxf.h" #include "reel.h" #include "test.h" #include "cpl.h" @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) boost::filesystem::path work_dir = "build/test/round_trip_test"; boost::filesystem::create_directory (work_dir); - shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (work_dir, "video.mxf")); + shared_ptr<dcp::MonoPictureMXF> asset_A (new dcp::MonoPictureMXF (work_dir, "video.mxf")); asset_A->set_edit_rate (24); asset_A->set_intrinsic_duration (24); asset_A->set_size (dcp::Size (32, 32)); @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) asset_A->set_key (key); shared_ptr<dcp::CPL> cpl (new dcp::CPL (work_dir, "A Test DCP", dcp::FEATURE, 24, 24)); - cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (asset_A, shared_ptr<dcp::SoundAsset> (), shared_ptr<dcp::SubtitleAsset> ()))); + cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (asset_A, shared_ptr<dcp::SoundMXF> (), shared_ptr<dcp::SubtitleAsset> ()))); /* A KDM using our certificate chain's leaf key pair */ dcp::KDM kdm_A ( @@ -100,8 +100,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test) } /* Reload the picture MXF */ - shared_ptr<dcp::MonoPictureAsset> asset_B ( - new dcp::MonoPictureAsset (work_dir, "video.mxf") + shared_ptr<dcp::MonoPictureMXF> asset_B ( + new dcp::MonoPictureMXF (work_dir, "video.mxf") ); asset_B->set_key (kdm_B.keys().front().key()); |