Rename video/audio/subtitle part methods.

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index b5faec5679ed97eb435e59812ca9c8736261e2f5..24a38f2cda97c45d39d63150a2ce69ca43865223 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -21,6 +21,7 @@
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "video_content.h"
+#include "subtitle_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
@@ -51,8 +52,8 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 Playlist::Playlist ()
-       : _sequence_video (true)
-       , _sequencing_video (false)
+       : _sequence (true)
+       , _sequencing (false)
 {
 
 }
@@ -66,13 +67,13 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-       if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+       if (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_video ();
+               maybe_sequence ();
        }
 
        if (
@@ -92,34 +93,55 @@ Playlist::content_changed (weak_ptr<Content> content, int property, bool frequen
 }
 
 void
-Playlist::maybe_sequence_video ()
+Playlist::maybe_sequence ()
 {
-       if (!_sequence_video || _sequencing_video) {
+       if (!_sequence || _sequencing) {
                return;
        }
 
-       _sequencing_video = true;
+       _sequencing = true;
+
+       /* Keep track of the content that we've set the position of so that we don't
+          do it twice.
+       */
+       ContentList placed;
+
+       /* Video */
 
        DCPTime next_left;
        DCPTime next_right;
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
-               if (!vc) {
+               if (!i->video) {
                        continue;
                }
 
-               if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
-                       vc->set_position (next_right);
-                       next_right = vc->end();
+               if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                       i->set_position (next_right);
+                       next_right = i->end();
                } else {
-                       vc->set_position (next_left);
-                       next_left = vc->end();
+                       i->set_position (next_left);
+                       next_left = i->end();
                }
+
+               placed.push_back (i);
        }
 
+       /* Subtitles */
+
+       DCPTime next;
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) {
+                       continue;
+               }
+
+               i->set_position (next);
+               next = i->end();
+       }
+
+
        /* This won't change order, so it does not need a sort */
 
-       _sequencing_video = false;
+       _sequencing = false;
 }
 
 string
@@ -128,12 +150,8 @@ Playlist::video_identifier () const
        string t;
 
        BOOST_FOREACH (shared_ptr<const Content> i, _content) {
-               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (i);
-               shared_ptr<const SubtitleContent> sc = dynamic_pointer_cast<const SubtitleContent> (i);
-               if (vc) {
-                       t += vc->identifier ();
-               } else if (sc && sc->burn_subtitles ()) {
-                       t += sc->identifier ();
+               if (i->video || (i->subtitle && i->subtitle->burn())) {
+                       t += i->identifier ();
                }
        }
 
@@ -248,15 +266,14 @@ Playlist::best_dcp_frame_rate () const
 
                float this_error = 0;
                BOOST_FOREACH (shared_ptr<Content> j, _content) {
-                       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
-                       if (!vc || !vc->has_own_video_frame_rate()) {
+                       if (!j->video || !j->video->has_own_frame_rate()) {
                                continue;
                        }
 
                        /* Best error for this content; we could use the content as-is or double its rate */
                        float best_error = min (
-                               float (fabs (i->source - vc->video_frame_rate ())),
-                               float (fabs (i->source - vc->video_frame_rate () * 2))
+                               float (fabs (i->source - j->video->frame_rate ())),
+                               float (fabs (i->source - j->video->frame_rate () * 2))
                                );
 
                        /* Use the largest difference between DCP and source as the "error" */
@@ -325,7 +342,20 @@ Playlist::video_end () const
 {
        DCPTime end;
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               if (dynamic_pointer_cast<const VideoContent> (i)) {
+               if (i->video) {
+                       end = max (end, i->end ());
+               }
+       }
+
+       return end;
+}
+
+DCPTime
+Playlist::subtitle_end () const
+{
+       DCPTime end;
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (i->subtitle) {
                        end = max (end, i->end ());
                }
        }
@@ -337,16 +367,15 @@ FrameRateChange
 Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
 {
        for (ContentList::const_reverse_iterator i = _content.rbegin(); i != _content.rend(); ++i) {
-               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
-               if (!vc) {
+               if (!(*i)->video) {
                        continue;
                }
 
-               if (vc->position() <= t) {
+               if ((*i)->position() <= t) {
                        /* This is the first piece of content (going backwards...) that starts before t,
                           so it's the active one.
                        */
-                       return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
+                       return FrameRateChange ((*i)->video->frame_rate(), dcp_video_frame_rate);
                }
        }
 
@@ -354,9 +383,9 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
 }
 
 void
-Playlist::set_sequence_video (bool s)
+Playlist::set_sequence (bool s)
 {
-       _sequence_video = s;
+       _sequence = s;
 }
 
 bool
@@ -367,9 +396,9 @@ ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
        }
 
        /* Put video before audio if they start at the same time */
-       if (dynamic_pointer_cast<VideoContent>(a) && !dynamic_pointer_cast<VideoContent>(b)) {
+       if (a->video && !b->video) {
                return true;
-       } else if (!dynamic_pointer_cast<VideoContent>(a) && dynamic_pointer_cast<VideoContent>(b)) {
+       } else if (!a->video && b->video) {
                return false;
        }