X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=a2bec83bb3266948802c14f4c9fe4436e3b4e649;hb=931fa4ef2dbfb7c9f726c4dd41eea79621b49906;hp=de48ff5f5cd0d49bb31a2691a437c4f825eddf38;hpb=6244677a4e92989da3aca309e9eaba0ce420e4a3;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index de48ff5f5..a2bec83bb 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -26,8 +26,7 @@
 #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"
@@ -65,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 ();
 	}
 	
@@ -82,16 +81,24 @@ Playlist::maybe_sequence_video ()
 	_sequencing_video = true;
 	
 	ContentList cl = _content;
-	sort (cl.begin(), cl.end(), ContentSorter ());
-	Time last = 0;
-	for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) {
-		if (!dynamic_pointer_cast<VideoContent> (*i)) {
+	Time next_left = 0;
+	Time next_right = 0;
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++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 */
 	
 	_sequencing_video = false;
 }
@@ -113,13 +120,15 @@ Playlist::video_identifier () const
 
 /** @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 ());
+
 	reconnect ();
 }
 
@@ -136,6 +145,7 @@ void
 Playlist::add (shared_ptr<Content> c)
 {
 	_content.push_back (c);
+	sort (_content.begin(), _content.end(), ContentSorter ());
 	reconnect ();
 	Changed ();
 }
@@ -152,6 +162,8 @@ Playlist::remove (shared_ptr<Content> c)
 		_content.erase (i);
 		Changed ();
 	}
+
+	/* This won't change order, so it does not need a sort */
 }
 
 void
@@ -168,6 +180,8 @@ Playlist::remove (ContentList c)
 		}
 	}
 
+	/* This won't change order, so it does not need a sort */
+	
 	Changed ();
 }
 
@@ -252,7 +266,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;
@@ -325,6 +339,60 @@ Playlist::repeat (ContentList c, int n)
 		pos += range.second - range.first;
 	}
 
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
 	reconnect ();
 	Changed ();
 }
+
+void
+Playlist::move_earlier (shared_ptr<Content> c)
+{
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	ContentList::iterator previous = _content.end ();
+	ContentList::iterator i = _content.begin();
+	while (i != _content.end() && *i != c) {
+		previous = i;
+		++i;
+	}
+
+	assert (i != _content.end ());
+	if (previous == _content.end ()) {
+		return;
+	}
+	
+	Time const p = (*previous)->position ();
+	(*previous)->set_position (p + c->length_after_trim ());
+	c->set_position (p);
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	Changed ();
+}
+
+void
+Playlist::move_later (shared_ptr<Content> c)
+{
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	ContentList::iterator i = _content.begin();
+	while (i != _content.end() && *i != c) {
+		++i;
+	}
+
+	assert (i != _content.end ());
+
+	ContentList::iterator next = i;
+	++next;
+
+	if (next == _content.end ()) {
+		return;
+	}
+
+	Time const p = (*next)->position ();
+	(*next)->set_position (c->position ());
+	c->set_position (p + c->length_after_trim ());
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	Changed ();
+}