Rename Subtitle -> Text

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 12832cfd78aa3c5c059e29723c73d29d4a84d3ee..13b4d7337212a6a34be6d3fd89ad39e8d832935e 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -20,7 +20,7 @@
 
 #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"
@@ -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
@@ -544,51 +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;
-               }
-               if (i->position() <= time && time < i->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
 {