X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=dc87fbfabb31702a2c18f4c4bd5469f15e6b71e7;hb=79a871ea740509ff2fa540ca715375e0ba1c4ad9;hp=c54b24c1c947e3bc78c134c74fc36f0e30468ee5;hpb=c3c16fef82ca70542e586d83418fb01c021dbe0e;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c54b24c1c..dc87fbfab 100644
--- 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 next = 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 (next);
-		next = (*i)->end() + 1;
+	
+		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 ());
@@ -391,14 +398,19 @@ Playlist::move_later (shared_ptr<Content> c)
 	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);
 }