/*
- Copyright (C) 2012-202]1 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
using std::dynamic_pointer_cast;
-using std::list;
-using std::make_shared;
using std::shared_ptr;
using std::string;
using std::vector;
BOOST_CHECK_EQUAL (subs.language(), "French");
auto lfn = subs.load_font_nodes ();
- BOOST_REQUIRE_EQUAL (lfn.size(), 1);
+ BOOST_REQUIRE_EQUAL (lfn.size(), 1U);
shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ());
BOOST_REQUIRE (interop_lfn);
BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
auto s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 1);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFontId"),
dcp::HAlign::CENTER,
0.15,
dcp::VAlign::BOTTOM,
+ 0,
+ dcp::Direction::LTR,
+ "My jacket was ",
+ dcp::Effect::BORDER,
+ dcp::Colour (0, 0, 0),
+ dcp::Time (0, 0, 0, 1, 250),
+ dcp::Time (0, 0, 0, 1, 250),
+ 0,
+ {}
+ ));
+ BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+ BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+ string ("theFontId"),
+ false,
+ false,
+ false,
+ dcp::Colour (255, 255, 255),
+ 39,
+ 1.0,
+ dcp::Time (0, 0, 5, 198, 250),
+ dcp::Time (0, 0, 7, 115, 250),
+ 0,
+ dcp::HAlign::CENTER,
+ 0.15,
+ dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
- "My jacket was Idi Amin's",
+ "Idi Amin's",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 1, 250),
- dcp::Time (0, 0, 0, 1, 250)
+ dcp::Time (0, 0, 0, 1, 250),
+ 6,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFontId"),
dcp::HAlign::CENTER,
0.21,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
"My corset was H.M. The Queen's",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 1, 250),
- dcp::Time (0, 0, 0, 1, 250)
+ dcp::Time (0, 0, 0, 1, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.15,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
"My large wonderbra",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 1, 250),
- dcp::Time (0, 0, 0, 1, 250)
+ dcp::Time (0, 0, 0, 1, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 1);
+ BOOST_REQUIRE_EQUAL (s.size(), 1U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
string ("theFontId"),
dcp::HAlign::CENTER,
0.15,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
"Once belonged to the Shah",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 1, 250),
- dcp::Time (0, 0, 0, 1, 250)
+ dcp::Time (0, 0, 0, 1, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 1);
+ BOOST_REQUIRE_EQUAL (s.size(), 1U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
string ("theFontId"),
dcp::HAlign::CENTER,
0.15,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
"And these are Roy Hattersley's jeans",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 1, 250),
- dcp::Time (0, 0, 0, 1, 250)
+ dcp::Time (0, 0, 0, 1, 250),
+ 0,
+ {}
));
}
dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
auto s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"At afternoon tea with John Peel",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 250),
- dcp::Time (0, 0, 0, 0, 250)
+ dcp::Time (0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"I enquired if his accent was real",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 250),
- dcp::Time (0, 0, 0, 0, 250)
+ dcp::Time (0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"He said \"out of the house",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 250),
- dcp::Time (0, 0, 0, 0, 250)
+ dcp::Time (0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"I'm incredibly scouse",
dcp::Effect::BORDER,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 250),
- dcp::Time (0, 0, 0, 0, 250)
+ dcp::Time (0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"At home it depends how I feel.\"",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"I spent a long weekend in Brighton",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::RTL,
"With the legendary Miss Enid Blyton",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::TTB,
"She said \"you be Noddy",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::BTT,
"That curious creature the Sphinx",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"Is smarter than anyone thinks",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"It sits there and smirks",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"And you don't think it works",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"Then when you're not looking, it winks.",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"When it snows you will find Sister Sledge",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"Out mooning, at night, on the ledge",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"One storey down",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
- BOOST_REQUIRE_EQUAL (s.size(), 2);
+ BOOST_REQUIRE_EQUAL (s.size(), 2U);
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
string ("theFont"),
dcp::HAlign::CENTER,
0.89,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"HELLO",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
dcp::HAlign::CENTER,
0.95,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"WORLD",
dcp::Effect::BORDER,
dcp::Colour(0, 0, 0),
dcp::Time(0, 0, 0, 0, 250),
- dcp::Time(0, 0, 0, 0, 250)
+ dcp::Time(0, 0, 0, 0, 250),
+ 0,
+ {}
));
}
{
dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
- BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
+ BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1U);
auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles().front());
BOOST_REQUIRE (si);
BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
c.set_movie_title ("Test");
c.add (
- make_shared<dcp::SubtitleString>(
+ std::make_shared<dcp::SubtitleString>(
string ("Frutiger"),
false,
false,
dcp::HAlign::CENTER,
0.8,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"Hello world",
dcp::Effect::NONE,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 24),
- dcp::Time (0, 0, 0, 0, 24)
+ dcp::Time (0, 0, 0, 0, 24),
+ 0,
+ std::vector<dcp::Ruby>()
)
);
c.add (
- make_shared<dcp::SubtitleString>(
+ std::make_shared<dcp::SubtitleString>(
boost::optional<string> (),
true,
true,
dcp::HAlign::CENTER,
0.4,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
- "What's going on",
+ "What's going ",
dcp::Effect::BORDER,
dcp::Colour (1, 2, 3),
dcp::Time (1, 2, 3, 4, 24),
- dcp::Time (5, 6, 7, 8, 24)
+ dcp::Time (5, 6, 7, 8, 24),
+ 0,
+ std::vector<dcp::Ruby>()
+ )
+ );
+
+ c.add (
+ std::make_shared<dcp::SubtitleString>(
+ boost::optional<string> (),
+ true,
+ true,
+ true,
+ dcp::Colour (128, 0, 64),
+ 91,
+ 1.0,
+ dcp::Time (5, 41, 0, 21, 24),
+ dcp::Time (6, 12, 15, 21, 24),
+ 0,
+ dcp::HAlign::CENTER,
+ 0.4,
+ dcp::VAlign::BOTTOM,
+ 0,
+ dcp::Direction::LTR,
+ "on",
+ dcp::Effect::BORDER,
+ dcp::Colour (1, 2, 3),
+ dcp::Time (1, 2, 3, 4, 24),
+ dcp::Time (5, 6, 7, 8, 24),
+ 9,
+ std::vector<dcp::Ruby>()
)
);
c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
check_xml (
- "<DCSubtitle Version=\"1.0\">"
- "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
- "<MovieTitle>Test</MovieTitle>"
- "<ReelNumber>1</ReelNumber>"
- "<Language>EN</Language>"
- "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
- "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
- "<Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
- "</Subtitle>"
- "</Font>"
- "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
- "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
- "<Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
- "</Subtitle>"
- "</Font>"
+ "<DCSubtitle Version=\"1.0\">\n"
+ " <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
+ " <MovieTitle>Test</MovieTitle>\n"
+ " <ReelNumber>1</ReelNumber>\n"
+ " <Language>EN</Language>\n"
+ " <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
+ " <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
+ " <Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
+ " </Subtitle>\n"
+ " </Font>\n"
+ " <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
+ " <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
+ " <Text VAlign=\"bottom\" VPosition=\"40\">What's going <Space Size=\"9em\"/>on</Text>\n"
+ " </Subtitle>\n"
+ " </Font>\n"
"</DCSubtitle>",
c.xml_as_string (),
vector<string>()
c.set_movie_title ("Test");
c.add (
- make_shared<dcp::SubtitleString>(
+ std::make_shared<dcp::SubtitleString>(
string ("Frutiger"),
false,
false,
dcp::HAlign::CENTER,
0.8,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
"Hello world",
dcp::Effect::NONE,
dcp::Colour (0, 0, 0),
dcp::Time (0, 0, 0, 0, 24),
- dcp::Time (0, 0, 0, 0, 24)
+ dcp::Time (0, 0, 0, 0, 24),
+ 0,
+ std::vector<dcp::Ruby>()
)
);
c.add (
- make_shared<dcp::SubtitleString>(
+ std::make_shared<dcp::SubtitleString>(
boost::optional<string>(),
true,
true,
dcp::HAlign::CENTER,
0.4,
dcp::VAlign::BOTTOM,
+ 0,
dcp::Direction::LTR,
"What's going on",
dcp::Effect::BORDER,
dcp::Colour (1, 2, 3),
dcp::Time (1, 2, 3, 4, 24),
- dcp::Time (5, 6, 7, 8, 24)
+ dcp::Time (5, 6, 7, 8, 24),
+ 0,
+ std::vector<dcp::Ruby>()
)
);
c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
check_xml (
- "<DCSubtitle Version=\"1.0\">"
- "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
- "<MovieTitle>Test</MovieTitle>"
- "<ReelNumber>1</ReelNumber>"
- "<Language>EN</Language>"
- "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
- "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
- "<Text HPosition=\"-20\" VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
- "</Subtitle>"
- "</Font>"
- "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
- "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
- "<Text HPosition=\"-20\" VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
- "</Subtitle>"
- "</Font>"
+ "<DCSubtitle Version=\"1.0\">\n"
+ " <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
+ " <MovieTitle>Test</MovieTitle>\n"
+ " <ReelNumber>1</ReelNumber>\n"
+ " <Language>EN</Language>\n"
+ " <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
+ " <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
+ " <Text HPosition=\"-20\" VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
+ " </Subtitle>\n"
+ " </Font>\n"
+ " <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
+ " <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
+ " <Text HPosition=\"-20\" VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n"
+ " </Subtitle>\n"
+ " </Font>\n"
"</DCSubtitle>",
c.xml_as_string (),
vector<string>()
{
RNGFixer fix;
- auto c = make_shared<dcp::InteropSubtitleAsset>();
+ auto c = std::make_shared<dcp::InteropSubtitleAsset>();
c->set_reel_number ("1");
c->set_language ("EN");
c->set_movie_title ("Test");
c->add (
- make_shared<dcp::SubtitleImage>(
+ std::make_shared<dcp::SubtitleImage>(
dcp::ArrayData ("test/data/sub.png"),
dcp::Time (0, 4, 9, 22, 24),
dcp::Time (0, 4, 11, 22, 24),
dcp::HAlign::CENTER,
0.8,
dcp::VAlign::TOP,
+ 0,
dcp::Time (0, 0, 0, 0, 24),
dcp::Time (0, 0, 0, 0, 24)
)
boost::filesystem::create_directories ("build/test/write_interop_subtitle_test3");
c->write ("build/test/write_interop_subtitle_test3/subs.xml");
- auto reel = make_shared<dcp::Reel>();
- reel->add(make_shared<dcp::ReelInteropSubtitleAsset>(c, dcp::Fraction(24, 1), 6046, 0));
+ auto reel = std::make_shared<dcp::Reel>();
+ reel->add(std::make_shared<dcp::ReelInteropSubtitleAsset>(c, dcp::Fraction(24, 1), 6046, 0));
string const issue_date = "2018-09-02T04:45:18+00:00";
string const issuer = "libdcp";
string const creator = "libdcp";
string const annotation_text = "Created by libdcp";
- auto cpl = make_shared<dcp::CPL>("My film", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP);
+ auto cpl = std::make_shared<dcp::CPL>("My film", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP);
cpl->add (reel);
cpl->set_issuer (issuer);
cpl->set_creator (creator);
dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
dcp.add (cpl);
- dcp.write_xml (issuer, creator, issue_date, annotation_text);
+ dcp.set_issuer(issuer);
+ dcp.set_creator(creator);
+ dcp.set_issue_date(issue_date);
+ dcp.set_annotation_text(annotation_text);
+ dcp.write_xml();
check_xml (
dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),
dcp::file_to_string("build/test/write_interop_subtitle_test3/subs.xml"),
vector<string>()
);
- check_file ("build/test/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png", "test/data/sub.png");
+ check_file(find_file("build/test/write_interop_subtitle_test3", ".png"), "test/data/sub.png");
check_xml (
dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
);
check_xml (
- dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"),
- dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"),
+ dcp::file_to_string(find_file("test/ref/write_interop_subtitle_test3", "pkl")),
+ dcp::file_to_string(find_file("build/test/write_interop_subtitle_test3", "pkl")),
vector<string>()
);
}
projects / libdcp.git / blobdiff