/*
- 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 "text_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)
+Playlist::content_change (ChangeType type, weak_ptr<Content> content, int property, bool frequent)
{
- 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
- being sequenced.
- */
- maybe_sequence ();
- }
-
- if (
- property == ContentProperty::POSITION ||
- property == ContentProperty::LENGTH ||
- property == ContentProperty::TRIM_START ||
- property == ContentProperty::TRIM_END) {
-
- ContentList old = _content;
- sort (_content.begin(), _content.end(), ContentSorter ());
- if (_content != old) {
- OrderChanged ();
+ if (type == CHANGE_TYPE_DONE) {
+ 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
+ being sequenced.
+ */
+ maybe_sequence ();
+ }
+
+ if (
+ property == ContentProperty::POSITION ||
+ property == ContentProperty::LENGTH ||
+ property == ContentProperty::TRIM_START ||
+ property == ContentProperty::TRIM_END) {
+
+ ContentList old = _content;
+ sort (_content.begin(), _content.end(), ContentSorter ());
+ if (_content != old) {
+ OrderChanged ();
+ }
}
}
- ContentChanged (content, property, frequent);
+ ContentChange (type, content, property, frequent);
}
void
placed.push_back (i);
}
- /* Subtitles */
+ /* Captions */
DCPTime next;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) {
+ if (i->text.empty() || 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())) {
+ bool burn = false;
+ BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ if (j->burn()) {
+ burn = true;
+ }
+ }
+ if (i->video || burn) {
t += i->identifier ();
}
}
void
Playlist::add (shared_ptr<Content> c)
{
+ Change (CHANGE_TYPE_PENDING);
_content.push_back (c);
sort (_content.begin(), _content.end(), ContentSorter ());
reconnect ();
- Changed ();
+ Change (CHANGE_TYPE_DONE);
}
void
Playlist::remove (shared_ptr<Content> c)
{
+ Change (CHANGE_TYPE_PENDING);
+
ContentList::iterator i = _content.begin ();
while (i != _content.end() && *i != c) {
++i;
if (i != _content.end ()) {
_content.erase (i);
- Changed ();
+ Change (CHANGE_TYPE_DONE);
+ } else {
+ Change (CHANGE_TYPE_CANCELLED);
}
/* This won't change order, so it does not need a sort */
void
Playlist::remove (ContentList c)
{
+ Change (CHANGE_TYPE_PENDING);
+
BOOST_FOREACH (shared_ptr<Content> i, c) {
ContentList::iterator j = _content.begin ();
while (j != _content.end() && *j != i) {
/* This won't change order, so it does not need a sort */
- Changed ();
+ Change (CHANGE_TYPE_DONE);
}
class FrameRateCandidate
_content_connections.clear ();
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- _content_connections.push_back (i->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3)));
+ _content_connections.push_back (i->Change.connect(boost::bind(&Playlist::content_change, this, _1, _2, _3, _4)));
}
}
}
DCPTime
-Playlist::subtitle_end () const
+Playlist::text_end () const
{
DCPTime end;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (i->subtitle) {
+ if (!i->text.empty ()) {
end = max (end, i->end ());
}
}
range.second = max (range.second, i->end ());
}
+ Change (CHANGE_TYPE_PENDING);
+
DCPTime pos = range.second;
for (int i = 0; i < n; ++i) {
BOOST_FOREACH (shared_ptr<Content> j, c) {
sort (_content.begin(), _content.end(), ContentSorter ());
reconnect ();
- Changed ();
+ Change (CHANGE_TYPE_DONE);
}
void