projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some C++11 stuff.
[dcpomatic.git]
/
test
/
srt_subtitle_test.cc
diff --git
a/test/srt_subtitle_test.cc
b/test/srt_subtitle_test.cc
index 1ea4538ba258a6ef55bda49e66bbdd17909333a2..3fe9bc2d20792f5f29ba5089e3b3a9d369523864 100644
(file)
--- a/
test/srt_subtitle_test.cc
+++ b/
test/srt_subtitle_test.cc
@@
-36,7
+36,7
@@
using std::string;
using std::list;
using std::string;
using std::list;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using namespace dcpomatic;
/** Make a very short DCP with a single subtitle from .srt with no specified fonts */
using namespace dcpomatic;
/** Make a very short DCP with a single subtitle from .srt with no specified fonts */
@@
-98,10
+98,11
@@
check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref)
/** Make another DCP with a longer .srt file */
BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
{
/** Make another DCP with a longer .srt file */
BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
{
- shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
+ Cleanup cl;
+
+ shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test3", &cl);
film->set_container (Ratio::from_id ("185"));
film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_interop (true);
film->set_audio_channels (6);
film->set_name ("frobozz");
film->set_interop (true);
film->set_audio_channels (6);
@@
-116,6
+117,8
@@
BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
BOOST_REQUIRE (!wait_for_jobs());
check_subtitle_file (film, TestPaths::private_data() / "Ankoemmling_short.xml");
BOOST_REQUIRE (!wait_for_jobs());
check_subtitle_file (film, TestPaths::private_data() / "Ankoemmling_short.xml");
+
+ cl.run ();
}
/** Build a small DCP with no picture and a single subtitle overlaid onto it */
}
/** Build a small DCP with no picture and a single subtitle overlaid onto it */