projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PlainText -> PlainTextFile.
[dcpomatic.git]
/
test
/
player_test.cc
diff --git
a/test/player_test.cc
b/test/player_test.cc
index 7cc3bc27b0550c39b88f80bb4f8e1e14a629c36d..a66860911bedcfcfaa2b3b60243fafe74f7d8ee2 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-31,7
+31,7
@@
#include "lib/player.h"
#include "lib/video_content.h"
#include "lib/image_content.h"
#include "lib/player.h"
#include "lib/video_content.h"
#include "lib/image_content.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_
file_
content.h"
#include "lib/content_factory.h"
#include "lib/dcp_content.h"
#include "lib/text_content.h"
#include "lib/content_factory.h"
#include "lib/dcp_content.h"
#include "lib/text_content.h"
@@
-181,7
+181,7
@@
BOOST_AUTO_TEST_CASE (player_interleave_test)
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<PlainText
Content> s (new PlainText
Content (film, "test/data/subrip.srt"));
+ shared_ptr<PlainText
FileContent> s (new PlainTextFile
Content (film, "test/data/subrip.srt"));
film->examine_and_add_content (s);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (s);
BOOST_REQUIRE (!wait_for_jobs ());