projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More enum class additions.
[dcpomatic.git]
/
test
/
subtitle_reel_number_test.cc
diff --git
a/test/subtitle_reel_number_test.cc
b/test/subtitle_reel_number_test.cc
index d8c596c9468d2fc825be0573ed675e9a11fe2ba6..b19fd1cd00fcbf474253f37f25da73d8a08f1658 100644
(file)
--- a/
test/subtitle_reel_number_test.cc
+++ b/
test/subtitle_reel_number_test.cc
@@
-48,7
+48,7
@@
BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
BOOST_REQUIRE (!wait_for_jobs ());
content->only_text()->set_use (true);
content->only_text()->set_burn (false);
BOOST_REQUIRE (!wait_for_jobs ());
content->only_text()->set_use (true);
content->only_text()->set_burn (false);
- film->set_reel_type (R
EELTYPE_
BY_LENGTH);
+ film->set_reel_type (R
eelType::
BY_LENGTH);
film->set_interop (true);
film->set_reel_length (1024 * 1024 * 512);
film->make_dcp ();
film->set_interop (true);
film->set_reel_length (1024 * 1024 * 512);
film->make_dcp ();
@@
-57,13
+57,13
@@
BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name());
dcp.read ();
BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name());
dcp.read ();
BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
-
shared_ptr<dcp::CPL> cpl = dcp.cpls().front()
;
+
auto cpl = dcp.cpls()[0]
;
BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6U);
int n = 1;
for (auto i: cpl->reels()) {
if (i->main_subtitle()) {
BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6U);
int n = 1;
for (auto i: cpl->reels()) {
if (i->main_subtitle()) {
-
shared_ptr<dcp::InteropSubtitleAsset>
ass = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(i->main_subtitle()->asset());
+
auto
ass = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(i->main_subtitle()->asset());
BOOST_REQUIRE (ass);
BOOST_CHECK_EQUAL (ass->reel_number(), dcp::raw_convert<string>(n));
++n;
BOOST_REQUIRE (ass);
BOOST_CHECK_EQUAL (ass->reel_number(), dcp::raw_convert<string>(n));
++n;