More fixes for errors / crashes / misbehaviour with content changes

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 739c5a20b3d0317f506786ce8dbc4fd544a91bab..1bb0ad0d6cda449354ed0eae1da435d59e649131 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,10 +20,11 @@
 
 #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"
+#include "audio_content.h"
 #include "content_factory.h"
 #include "dcp_content.h"
 #include "job.h"
@@ -63,10 +64,27 @@ Playlist::~Playlist ()
        reconnect ();
 }
 
+void
+Playlist::content_may_change ()
+{
+       ContentMayChange ();
+}
+
+void
+Playlist::content_not_changed ()
+{
+       ContentNotChanged ();
+}
+
 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
@@ -125,11 +143,11 @@ Playlist::maybe_sequence ()
                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;
                }
 
@@ -149,7 +167,13 @@ Playlist::video_identifier () const
        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 ();
                }
        }
@@ -159,7 +183,11 @@ Playlist::video_identifier () const
        return digester.get ();
 }
 
-/** @param node <Playlist> node */
+/** @param film Film that this Playlist is for.
+ *  @param node &lt;Playlist&gt; node.
+ *  @param version Metadata version number.
+ *  @param notes Output notes about that happened.
+ */
 void
 Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
 {
@@ -173,12 +201,14 @@ Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
        reconnect ();
 }
 
-/** @param node <Playlist> node */
+/** @param node &lt;Playlist&gt; node.
+ *  @param with_content_paths true to include &lt;Path&gt; nodes in &lt;Content&gt; nodes, false to omit them.
+ */
 void
-Playlist::as_xml (xmlpp::Node* node)
+Playlist::as_xml (xmlpp::Node* node, bool with_content_paths)
 {
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               i->as_xml (node->add_child ("Content"));
+               i->as_xml (node->add_child ("Content"), with_content_paths);
        }
 }
 
@@ -332,7 +362,9 @@ Playlist::reconnect ()
        _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->MayChange.connect(boost::bind(&Playlist::content_may_change, this)));
+               _content_connections.push_back (i->Changed.connect(boost::bind(&Playlist::content_changed, this, _1, _2, _3)));
+               _content_connections.push_back (i->NotChanged.connect(boost::bind(&Playlist::content_not_changed, this)));
        }
 }
 
@@ -350,11 +382,11 @@ Playlist::video_end () const
 }
 
 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 ());
                }
        }
@@ -511,3 +543,51 @@ Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_
        /* Add on 64k for bits and pieces (metadata, subs etc) */
        return video + audio + 65536;
 }
+
+string
+Playlist::content_summary (DCPTimePeriod period) const
+{
+       string best_summary;
+       int best_score = -1;
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               int score = 0;
+               optional<DCPTimePeriod> const o = DCPTimePeriod(i->position(), i->end()).overlap (period);
+               if (o) {
+                       score += 100 * o.get().duration().get() / period.duration().get();
+               }
+
+               if (i->video) {
+                       score += 100;
+               }
+
+               if (score > best_score) {
+                       best_summary = i->path(0).leaf().string();
+                       best_score = score;
+               }
+       }
+
+       return best_summary;
+}
+
+pair<double, double>
+Playlist::speed_up_range (int dcp_video_frame_rate) const
+{
+       pair<double, double> range (DBL_MAX, -DBL_MAX);
+
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (!i->video) {
+                       continue;
+               }
+               if (i->video_frame_rate()) {
+                       FrameRateChange const frc (i->video_frame_rate().get(), dcp_video_frame_rate);
+                       range.first = min (range.first, frc.speed_up);
+                       range.second = max (range.second, frc.speed_up);
+               } else {
+                       FrameRateChange const frc (dcp_video_frame_rate, dcp_video_frame_rate);
+                       range.first = min (range.first, frc.speed_up);
+                       range.second = max (range.second, frc.speed_up);
+               }
+       }
+
+       return range;
+}