X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=1e8a3319c54ed0569f0d555902d973eb61155d81;hp=b7b4c20f7fc56b6dc232be8a773360bab0bcee83;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index b7b4c20f7..1e8a3319c 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -64,7 +64,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 ();
 	}
 	
@@ -81,14 +81,21 @@ Playlist::maybe_sequence_video ()
 	_sequencing_video = true;
 	
 	ContentList cl = _content;
-	DCPTime next;
+	DCPTime next_left;
+	DCPTime next_right;
 	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() + DCPTime::delta ();
+		if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+			vc->set_position (next_right);
+			next_right = vc->end() + DCPTime::delta ();
+		} else {
+			vc->set_position (next_left);
+			next_left = vc->end() + DCPTime::delta ();
+		}
 	}
 
 	/* This won't change order, so it does not need a sort */
@@ -113,11 +120,11 @@ Playlist::video_identifier () const
 
 /** @param node <Playlist> node */
 void
-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> 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) {
-		_content.push_back (content_factory (film, *i, version));
+		_content.push_back (content_factory (film, *i, version, notes));
 	}
 
 	sort (_content.begin(), _content.end(), ContentSorter ());