projects / libdcp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make the former dcst namespace default for SMPTE subtitles.
[libdcp.git] / test / smpte_subtitle_test.cc
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index cc6190c2a29571bc6e5b24c57a73ef0a4441ff90..e93efefb5237912f4f1252dcb1e44e24d9178077 100644 (file)
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -222,27 +222,27 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 
        check_xml (
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
-                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
-                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
-                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
-                 "<dcst:Language>en</dcst:Language>"
-                 "<dcst:EditRate>24 1</dcst:EditRate>"
-                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
-                 "<dcst:SubtitleList>"
-                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-                       "<dcst:Text Valign=\"top\" Vposition=\"80\">Hello world</dcst:Text>"
-                     "</dcst:Subtitle>"
-                   "</dcst:Font>"
-                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">"
-                     "<dcst:Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">"
-                       "<dcst:Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</dcst:Text>"
-                     "</dcst:Subtitle>"
-                   "</dcst:Font>"
-                 "</dcst:SubtitleList>"
-               "</dcst:SubtitleReel>",
+               "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
+                 "<ContentTitleText>Test</ContentTitleText>"
+                 "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
+                 "<ReelNumber>1</ReelNumber>"
+                 "<Language>en</Language>"
+                 "<EditRate>24 1</EditRate>"
+                 "<TimeCodeRate>24</TimeCodeRate>"
+                 "<SubtitleList>"
+                   "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<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\" Underline=\"yes\" Weight=\"bold\">"
+                     "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">"
+                       "<Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</Text>"
+                     "</Subtitle>"
+                   "</Font>"
+                 "</SubtitleList>"
+               "</SubtitleReel>",
                c.xml_as_string (),
                vector<string>()
                );
@@ -408,31 +408,31 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
        check_xml (
                c.xml_as_string(),
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
-                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
-                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
-                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
-                 "<dcst:Language>en</dcst:Language>"
-                 "<dcst:EditRate>24 1</dcst:EditRate>"
-                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
-                 "<dcst:SubtitleList>"
-                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-                       "<dcst:Text Valign=\"top\" Vposition=\"80\">"
-                         "<dcst:Font Italic=\"no\">Testing is </dcst:Font>"
-                         "<dcst:Font Italic=\"yes\">really</dcst:Font>"
-                         "<dcst:Font Italic=\"no\"> fun</dcst:Font>"
-                       "</dcst:Text>"
-                       "<dcst:Text Valign=\"top\" Vposition=\"90\">"
-                         "<dcst:Font Italic=\"no\">This is the </dcst:Font>"
-                         "<dcst:Font Italic=\"yes\">second</dcst:Font>"
-                         "<dcst:Font Italic=\"no\"> line</dcst:Font>"
-                       "</dcst:Text>"
-                     "</dcst:Subtitle>"
-                   "</dcst:Font>"
-                 "</dcst:SubtitleList>"
-               "</dcst:SubtitleReel>",
+               "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
+                 "<ContentTitleText>Test</ContentTitleText>"
+                 "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
+                 "<ReelNumber>1</ReelNumber>"
+                 "<Language>en</Language>"
+                 "<EditRate>24 1</EditRate>"
+                 "<TimeCodeRate>24</TimeCodeRate>"
+                 "<SubtitleList>"
+                   "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<Text Valign=\"top\" Vposition=\"80\">"
+                         "<Font Italic=\"no\">Testing is </Font>"
+                         "<Font Italic=\"yes\">really</Font>"
+                         "<Font Italic=\"no\"> fun</Font>"
+                       "</Text>"
+                       "<Text Valign=\"top\" Vposition=\"90\">"
+                         "<Font Italic=\"no\">This is the </Font>"
+                         "<Font Italic=\"yes\">second</Font>"
+                         "<Font Italic=\"no\"> line</Font>"
+                       "</Text>"
+                     "</Subtitle>"
+                   "</Font>"
+                 "</SubtitleList>"
+               "</SubtitleReel>",
                vector<string>()
                );
 }
C++ library for handling digital cinema packages (DCPs).