summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-04 12:25:48 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 15:53:48 +0100
commit42a65cba0d8da23c12af52015e66cd9dc0b5a5fa (patch)
treeff0a017c49d0975f21a5314d2f77be20f68bd379 /test
parent943e75e0ac5730714f3823771f127fe78e4cf82b (diff)
Initial work on SMPTE subtitles.
Diffstat (limited to 'test')
-rw-r--r--test/rewrite_subs.cc2
-rw-r--r--test/write_subtitle_test.cc5
2 files changed, 4 insertions, 3 deletions
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index e62b9169..5bfe126f 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -51,7 +51,7 @@ main (int argc, char* argv[])
for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
if ((*j)->main_subtitle()) {
- (*j)->main_subtitle()->subtitle_asset()->write_xml ((*j)->main_subtitle()->subtitle_asset()->file ());
+ (*j)->main_subtitle()->subtitle_asset()->write ((*j)->main_subtitle()->subtitle_asset()->file ());
}
}
}
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index b02a6e59..958fc981 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -30,6 +30,7 @@ using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (write_subtitle_test)
{
dcp::InteropSubtitleAsset c ("Test", "EN");
+ c.set_reel_number ("1");
c.add (
dcp::SubtitleString (
@@ -83,12 +84,12 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
" <ReelNumber>1</ReelNumber>\n"
" <Language>EN</Language>\n"
" <Font Id=\"Frutiger\" Italic=\"no\" Color=\"FFFFFFFF\" Size=\"48\" Effect=\"none\" EffectColor=\"FF000000\" Script=\"normal\" Underlined=\"no\" Weight=\"normal\">\n"
- " <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:022\" TimeOut=\"00:04:11:022\" FadeUpTime=\"0\" FadeDownTime=\"0\">\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 Italic=\"yes\" Color=\"FF800040\" Size=\"91\" Effect=\"border\" EffectColor=\"FF010203\" Script=\"normal\" Underlined=\"no\" Weight=\"normal\">\n"
- " <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:021\" TimeOut=\"06:12:15:021\" FadeUpTime=\"930790\" FadeDownTime=\"4591830\">\n"
+ " <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930790\" FadeDownTime=\"4591830\">\n"
" <Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n"
" </Subtitle>\n"
" </Font>\n"