projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up after previous commit.
[dcpomatic.git]
/
src
/
lib
/
playlist.cc
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index 13b4d7337212a6a34be6d3fd89ad39e8d832935e..a5451bafa418e21fedacb48eb319f8dfb8d33bcc 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,7
+20,7
@@
#include "playlist.h"
#include "video_content.h"
#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"
#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) {
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;
}
continue;
}
@@
-155,7
+155,7
@@
Playlist::video_identifier () const
string t;
BOOST_FOREACH (shared_ptr<const Content> i, _content) {
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 ();
}
}
t += i->identifier ();
}
}
@@
-366,7
+366,7
@@
Playlist::subtitle_end () const
{
DCPTime end;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
{
DCPTime end;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (i->
subtitle
) {
+ if (i->
caption
) {
end = max (end, i->end ());
}
}
end = max (end, i->end ());
}
}