X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fplaylist.cc;fp=src%2Flib%2Fplaylist.cc;h=a5451bafa418e21fedacb48eb319f8dfb8d33bcc;hb=27b83475435dda4e84a90cf59a52f150905c4ab1;hp=13b4d7337212a6a34be6d3fd89ad39e8d832935e;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 13b4d7337..a5451bafa 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,7 +20,7 @@
 
 #include "playlist.h"
 #include "video_content.h"
-#include "text_content.h"
+#include "caption_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
@@ -135,7 +135,7 @@ Playlist::maybe_sequence ()
 
 	DCPTime next;
 	BOOST_FOREACH (shared_ptr<Content> i, _content) {
-		if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) {
+		if (!i->caption || find (placed.begin(), placed.end(), i) != placed.end()) {
 			continue;
 		}
 
@@ -155,7 +155,7 @@ Playlist::video_identifier () const
 	string t;
 
 	BOOST_FOREACH (shared_ptr<const Content> i, _content) {
-		if (i->video || (i->subtitle && i->subtitle->burn())) {
+		if (i->video || (i->caption && i->caption->burn())) {
 			t += i->identifier ();
 		}
 	}
@@ -366,7 +366,7 @@ Playlist::subtitle_end () const
 {
 	DCPTime end;
 	BOOST_FOREACH (shared_ptr<Content> i, _content) {
-		if (i->subtitle) {
+		if (i->caption) {
 			end = max (end, i->end ());
 		}
 	}