diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-06 08:28:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-10 13:09:45 +0000 |
| commit | 93f29880839dc5589bb35f63260a7152ead7655f (patch) | |
| tree | 865dd65298dd11d949efed2ac3f58f3564c7cc8f /test/dcp_font_test.cc | |
| parent | d7965cce4c5f95da7971bce6f800739a4cd2f17d (diff) | |
Introduce dc::Package, changing lots of namespaces in the process.
Diffstat (limited to 'test/dcp_font_test.cc')
| -rw-r--r-- | test/dcp_font_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc index 7abecc11..e7d74e9d 100644 --- a/test/dcp_font_test.cc +++ b/test/dcp_font_test.cc @@ -46,24 +46,24 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test) check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/dummy.ttf"); shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); - reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0))); + reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0))); - shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER)); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::TRAILER)); cpl->add (reel); dcp.add (cpl); - dcp.write_xml (dcp::dc::INTEROP); + dcp.write_xml (dcp::DCP_INTEROP); dcp::dc::Package dcp2 (directory); dcp2.read (); - shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> ( + shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> ( dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset() ); BOOST_REQUIRE (subs2); BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1); boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf"); - FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb"); + FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb"); BOOST_REQUIRE (f); shared_array<uint8_t> ref (new uint8_t[size]); fread (ref.get(), 1, size, f); @@ -78,29 +78,29 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test) boost::filesystem::path directory = "build/test/smpte_dcp_font_test"; dcp::dc::Package dcp (directory); - shared_ptr<dcp::dc::SMPTESubtitleAsset> subs (new dcp::dc::SMPTESubtitleAsset ()); + shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset ()); subs->add_font ("theFontId", "test/data/dummy.ttf"); subs->write (directory / "frobozz.mxf"); shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); - reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0))); + reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0))); - shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER)); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::TRAILER)); cpl->add (reel); dcp.add (cpl); - dcp.write_xml (dcp::dc::SMPTE); + dcp.write_xml (dcp::DCP_SMPTE); dcp::dc::Package dcp2 (directory); dcp2.read (); - shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> ( + shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> ( dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset() ); BOOST_REQUIRE (subs2); BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1); boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf"); - FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb"); + FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb"); BOOST_REQUIRE (f); shared_array<uint8_t> ref (new uint8_t[size]); fread (ref.get(), 1, size, f); |