Bump version

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 621b99dd742ed6aa914beabb8f60d6042c622ebf..e847e623baf00d9f73150cc005c6e074dca4f4e6 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -19,19 +19,18 @@
 
 #include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/lexical_cast.hpp>
 #include "playlist.h"
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "video_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
+#include "image_decoder.h"
 #include "content_factory.h"
 #include "job.h"
 #include "config.h"
 #include "util.h"
+#include "md5_digester.h"
 
 #include "i18n.h"
 
@@ -47,7 +46,6 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
 
 Playlist::Playlist ()
        : _sequence_video (true)
@@ -65,7 +63,7 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-       if (property == ContentProperty::LENGTH) {
+       if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
                maybe_sequence_video ();
        }
        
@@ -82,14 +80,21 @@ Playlist::maybe_sequence_video ()
        _sequencing_video = true;
        
        ContentList cl = _content;
-       Time last = 0;
+       Time next_left = 0;
+       Time next_right = 0;
        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-               if (!dynamic_pointer_cast<VideoContent> (*i)) {
+               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+               if (!vc) {
                        continue;
                }
-               
-               (*i)->set_position (last);
-               last = (*i)->end ();
+       
+               if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                       vc->set_position (next_right);
+                       next_right = vc->end() + 1;
+               } else {
+                       vc->set_position (next_left);
+                       next_left = vc->end() + 1;
+               }
        }
 
        /* This won't change order, so it does not need a sort */
@@ -109,16 +114,18 @@ Playlist::video_identifier () const
                }
        }
 
-       return md5_digest (t.c_str(), t.length());
+       MD5Digester digester;
+       digester.add (t.c_str(), t.length());
+       return digester.get ();
 }
 
 /** @param node <Playlist> node */
 void
-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version, list<string>& notes)
 {
-       list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
-       for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-               _content.push_back (content_factory (film, *i));
+       list<cxml::NodePtr> c = node->node_children ("Content");
+       for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
+               _content.push_back (content_factory (film, *i, version, notes));
        }
 
        sort (_content.begin(), _content.end(), ContentSorter ());
@@ -260,7 +267,7 @@ Playlist::length () const
 {
        Time len = 0;
        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               len = max (len, (*i)->end ());
+               len = max (len, (*i)->end() + 1);
        }
 
        return len;
@@ -360,8 +367,6 @@ Playlist::move_earlier (shared_ptr<Content> c)
        (*previous)->set_position (p + c->length_after_trim ());
        c->set_position (p);
        sort (_content.begin(), _content.end(), ContentSorter ());
-       
-       Changed ();
 }
 
 void
@@ -387,18 +392,21 @@ Playlist::move_later (shared_ptr<Content> c)
        (*next)->set_position (c->position ());
        c->set_position (p + c->length_after_trim ());
        sort (_content.begin(), _content.end(), ContentSorter ());
-       
-       Changed ();
 }
 
-bool
-Playlist::content_paths_valid () const
+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) {
-               if (!(*i)->path_valid ()) {
-                       return false;
+               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 true;
+       return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
 }