Clean up after previous commit.

[dcpomatic.git] / src / lib / playlist.cc

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 3609f9eb3df59d46caf04149f46de1a5faf4aa43..a5451bafa418e21fedacb48eb319f8dfb8d33bcc 100644 (file)
--- 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 "subtitle_content.h"
+#include "caption_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
@@ -67,7 +67,12 @@ Playlist::~Playlist ()
 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
@@ -130,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;
                }
 
@@ -150,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 ();
                }
        }
@@ -361,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 ());
                }
        }
@@ -544,55 +549,6 @@ Playlist::content_summary (DCPTimePeriod period) const
        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
 {