Merge master.

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 8b874aae6676a757b7bf4e01b4e1bb13599478ef..16c740943ca89f382f27082ba70a935d987c484b 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -80,20 +80,20 @@ Playlist::maybe_sequence_video ()
        _sequencing_video = true;
        
        ContentList cl = _content;
        _sequencing_video = true;
        
        ContentList cl = _content;

-       Time next_left = 0;
-       Time next_right = 0;
+       DCPTime next_left;
+       DCPTime next_right;

        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
                shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
                if (!vc) {
                        continue;
                }
        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
                shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
                if (!vc) {
                        continue;
                }

-       
+               

                if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
                        vc->set_position (next_right);
                if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
                        vc->set_position (next_right);

-                       next_right = vc->end() + 1;
+                       next_right = vc->end() + DCPTime::delta ();

                } else {
                        vc->set_position (next_left);
                } else {
                        vc->set_position (next_left);

-                       next_left = vc->end() + 1;
+                       next_left = vc->end() + DCPTime::delta ();

                }
        }
 
                }
        }
 


@@ -121,7 +121,7 @@ Playlist::video_identifier () const
 
 /** @param node <Playlist> node */
 void
 
 /** @param node <Playlist> node */
 void

-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version, list<string>& notes)
+Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)

 {
        list<cxml::NodePtr> c = node->node_children ("Content");
        for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
 {
        list<cxml::NodePtr> c = node->node_children ("Content");
        for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {


@@ -186,19 +186,6 @@ Playlist::remove (ContentList c)
        Changed ();
 }
 
        Changed ();
 }
 

-bool
-Playlist::has_subtitles () const
-{
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
-               if (fc && !fc->subtitle_streams().empty()) {
-                       return true;
-               }
-       }
-
-       return false;
-}
-

 class FrameRateCandidate
 {
 public:
 class FrameRateCandidate
 {
 public:


@@ -262,12 +249,12 @@ Playlist::best_dcp_frame_rate () const
        return best->dcp;
 }
 
        return best->dcp;
 }
 

-Time
+DCPTime

 Playlist::length () const
 {
 Playlist::length () const
 {

-       Time len = 0;
+       DCPTime len;

        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {

-               len = max (len, (*i)->end() + 1);
+               len = max (len, (*i)->end() + DCPTime::delta ());

        }
 
        return len;
        }
 
        return len;


@@ -287,10 +274,10 @@ Playlist::reconnect ()
        }
 }
 
        }
 }
 

-Time
+DCPTime

 Playlist::video_end () const
 {
 Playlist::video_end () const
 {

-       Time end = 0;
+       DCPTime end;

        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
                if (dynamic_pointer_cast<const VideoContent> (*i)) {
                        end = max (end, (*i)->end ());
        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
                if (dynamic_pointer_cast<const VideoContent> (*i)) {
                        end = max (end, (*i)->end ());


@@ -300,6 +287,23 @@ Playlist::video_end () const
        return end;
 }
 
        return end;
 }
 

+FrameRateChange
+Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
+{
+       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+               if (!vc) {
+                       continue;
+               }
+
+               if (vc->position() >= t && t < vc->end()) {
+                       return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
+               }
+       }
+
+       return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
+}
+

 void
 Playlist::set_sequence_video (bool s)
 {
 void
 Playlist::set_sequence_video (bool s)
 {


@@ -322,7 +326,7 @@ Playlist::content () const
 void
 Playlist::repeat (ContentList c, int n)
 {
 void
 Playlist::repeat (ContentList c, int n)
 {

-       pair<Time, Time> range (TIME_MAX, 0);
+       pair<DCPTime, DCPTime> range (DCPTime::max (), DCPTime ());

        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                range.first = min (range.first, (*i)->position ());
                range.second = max (range.second, (*i)->position ());
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                range.first = min (range.first, (*i)->position ());
                range.second = max (range.second, (*i)->position ());


@@ -330,7 +334,7 @@ Playlist::repeat (ContentList c, int n)
                range.second = max (range.second, (*i)->end ());
        }
 
                range.second = max (range.second, (*i)->end ());
        }
 

-       Time pos = range.second;
+       DCPTime pos = range.second;

        for (int i = 0; i < n; ++i) {
                for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                        shared_ptr<Content> copy = (*i)->clone ();
        for (int i = 0; i < n; ++i) {
                for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                        shared_ptr<Content> copy = (*i)->clone ();


@@ -364,7 +368,7 @@ Playlist::move_earlier (shared_ptr<Content> c)
        }
 
        
        }
 
        

-       Time const p = (*previous)->position ();
+       DCPTime const p = (*previous)->position ();

        (*previous)->set_position (p + c->length_after_trim ());
        c->set_position (p);
        sort (_content.begin(), _content.end(), ContentSorter ());
        (*previous)->set_position (p + c->length_after_trim ());
        c->set_position (p);
        sort (_content.begin(), _content.end(), ContentSorter ());


@@ -393,20 +397,3 @@ Playlist::move_later (shared_ptr<Content> c)
        c->set_position (c->position() + c->length_after_trim ());
        sort (_content.begin(), _content.end(), ContentSorter ());
 }
        c->set_position (c->position() + c->length_after_trim ());
        sort (_content.begin(), _content.end(), ContentSorter ());
 }

-
-FrameRateChange
-Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
-{
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
-               if (!vc) {
-                       continue;
-               }
-
-               if (vc->position() >= t && t < vc->end()) {
-                       return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
-               }
-       }
-
-       return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
-}