summaryrefslogtreecommitdiff
path: root/src/lib/content.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/content.cc
parent9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff)
Clean up after previous commit.
Diffstat (limited to 'src/lib/content.cc')
-rw-r--r--src/lib/content.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index 1a8bc9eb2..af4c6c701 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -27,7 +27,7 @@
#include "content_factory.h"
#include "video_content.h"
#include "audio_content.h"
-#include "text_content.h"
+#include "caption_content.h"
#include "exceptions.h"
#include "film.h"
#include "job.h"
@@ -436,7 +436,7 @@ Content::take_settings_from (shared_ptr<const Content> c)
if (audio && c->audio) {
audio->take_settings_from (c->audio);
}
- if (subtitle && c->subtitle) {
- subtitle->take_settings_from (c->subtitle);
+ if (caption && c->caption) {
+ caption->take_settings_from (c->caption);
}
}