projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take Film pointer out of Content.
[dcpomatic.git]
/
test
/
subtitle_charset_test.cc
diff --git
a/test/subtitle_charset_test.cc
b/test/subtitle_charset_test.cc
index b15e3e70e403100e14d0b6aa329e89bab951b7a3..29dabe4bb5802a6f6ae105e1c746bf6f3d750cff 100644
(file)
--- a/
test/subtitle_charset_test.cc
+++ b/
test/subtitle_charset_test.cc
@@
-22,8
+22,8
@@
#include "lib/content.h"
#include "lib/film.h"
#include "lib/content_factory.h"
#include "lib/content.h"
#include "lib/film.h"
#include "lib/content_factory.h"
-#include "lib/
text_caption
_file.h"
-#include "lib/
text_caption
_file_content.h"
+#include "lib/
string_text
_file.h"
+#include "lib/
string_text
_file_content.h"
#include <boost/test/unit_test.hpp>
using boost::shared_ptr;
#include <boost/test/unit_test.hpp>
using boost::shared_ptr;
@@
-33,7
+33,7
@@
using boost::dynamic_pointer_cast;
BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
{
shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test1");
BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
{
shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test1");
- shared_ptr<Content> content = content_factory (
film, private_data / "PADDINGTON soustitresVFdef.srt").front
();
+ shared_ptr<Content> content = content_factory (
private_data / "PADDINGTON soustitresVFdef.srt").front
();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
}
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
}
@@
-42,11
+42,11
@@
BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
{
shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test2");
BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
{
shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test2");
- shared_ptr<Content> content = content_factory (
film, "test/data/osx.srt").front
();
+ shared_ptr<Content> content = content_factory (
"test/data/osx.srt").front
();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<
TextCaptionFile> ts = dynamic_pointer_cast<TextCaptionFile
> (content);
+ shared_ptr<
StringTextFileContent> ts = dynamic_pointer_cast<StringTextFileContent
> (content);
BOOST_REQUIRE (ts);
/* Make sure we got the subtitle data from the file */
BOOST_REQUIRE (ts);
/* Make sure we got the subtitle data from the file */
- BOOST_REQUIRE_EQUAL (content->full_length().get(), 6052032);
+ BOOST_REQUIRE_EQUAL (content->full_length(
film
).get(), 6052032);
}
}