diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-18 23:13:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | 65cc06076b46cbd27ccfcf7387894358e2c8ab1e (patch) | |
| tree | 72eed4030fa0cf08190723410467645a1f199dd1 /test/dcp_subtitle_test.cc | |
| parent | 491edba4e79656a045103a284c65b846a167d2ff (diff) | |
Merge master.
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index c57d694d0..3d05e143d 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -165,9 +165,9 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test4"); film->set_interop (true); - shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub3.xml")); film->examine_and_add_content (content); - shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + shared_ptr<DCPTextContent> content2 (new DCPTextContent (film, "test/data/dcp_sub3.xml")); film->examine_and_add_content (content2); BOOST_REQUIRE (!wait_for_jobs ()); |