summaryrefslogtreecommitdiff
path: root/src/lib/film.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-19 22:44:53 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-19 23:45:23 +0100
commit27b83475435dda4e84a90cf59a52f150905c4ab1 (patch)
tree51d0158c7a879f6b2f3c40843c5e5e455069a1dc /src/lib/film.cc
parent9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff)
Clean up after previous commit.
Diffstat (limited to 'src/lib/film.cc')
-rw-r--r--src/lib/film.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0be1ddd7b..f6941c1c7 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -46,7 +46,7 @@
#include "screen.h"
#include "audio_content.h"
#include "video_content.h"
-#include "text_content.h"
+#include "caption_content.h"
#include "ffmpeg_content.h"
#include "dcp_content.h"
#include "screen_kdm.h"
@@ -696,11 +696,11 @@ Film::isdcf_name (bool if_created_now) const
bool burnt_in = true;
BOOST_FOREACH (shared_ptr<Content> i, content ()) {
- if (!i->subtitle) {
+ if (!i->caption) {
continue;
}
- if (i->subtitle->use() && !i->subtitle->burn()) {
+ if (i->caption->use() && !i->caption->burn()) {
burnt_in = false;
}
}
@@ -1081,7 +1081,7 @@ Film::add_content (shared_ptr<Content> c)
/* Add {video,subtitle} content after any existing {video,subtitle} content */
if (c->video) {
c->set_position (_playlist->video_end ());
- } else if (c->subtitle) {
+ } else if (c->caption) {
c->set_position (_playlist->subtitle_end ());
}
@@ -1371,8 +1371,8 @@ Film::subtitle_language () const
ContentList cl = content ();
BOOST_FOREACH (shared_ptr<Content>& c, cl) {
- if (c->subtitle) {
- languages.insert (c->subtitle->language ());
+ if (c->caption) {
+ languages.insert (c->caption->language ());
}
}