/*
- 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.
#include "playlist.h"
#include "video_content.h"
-#include "subtitle_content.h"
+#include "caption_content.h"
#include "ffmpeg_decoder.h"
#include "ffmpeg_content.h"
#include "image_decoder.h"
void
Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
{
- if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) {
+ if (
+ property == ContentProperty::TRIM_START ||
+ property == ContentProperty::TRIM_END ||
+ property == ContentProperty::LENGTH ||
+ property == VideoContentProperty::FRAME_TYPE
+ ) {
/* Don't respond to position changes here, as:
- sequencing after earlier/later changes is handled by move_earlier/move_later
- any other position changes will be timeline drags which should not result in 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;
}
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 ();
}
}
{
DCPTime end;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (i->subtitle) {
+ if (i->caption) {
end = max (end, i->end ());
}
}