/*
- 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)
{
- 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
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->caption.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->caption) {
+ if (j->burn()) {
+ burn = true;
+ }
+ }
+ if (i->video || burn) {
t += i->identifier ();
}
}
}
DCPTime
-Playlist::subtitle_end () const
+Playlist::caption_end () const
{
DCPTime end;
BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (i->subtitle) {
+ if (!i->caption.empty ()) {
end = max (end, i->end ());
}
}
return best_summary;
}
-bool
-Playlist::video_content_at (DCPTime time) const
-{
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (i->video && i->position() <= time && time < i->end()) {
- return true;
- }
- }
-
- return false;
-}
-
-bool
-Playlist::audio_content_at (DCPTime time) const
-{
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (!i->audio) {
- continue;
- }
- DCPTime end = i->end ();
- if (i->audio->delay() < 0) {
- end += DCPTime::from_seconds (i->audio->delay() / 1000.0);
- }
- if (i->position() <= time && time < end) {
- return true;
- }
- }
-
- return false;
-}
-
-shared_ptr<Content>
-Playlist::next_audio_content (DCPTime time) const
-{
- shared_ptr<Content> next;
- DCPTime next_position;
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- if (!i->audio) {
- continue;
- }
- if (i->position() >= time && (!next || i->position() < next_position)) {
- next = i;
- next_position = i->position();
- }
- }
-
- return next;
-}
-
pair<double, double>
Playlist::speed_up_range (int dcp_video_frame_rate) const
{