X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=9a048980c0b02aebadd481db236149df8544de8e;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=8952f00be64b1c106a019ef22959d44852fa13df;hpb=853b8641ee7fb8348302c0daae838c4891769b1d;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 8952f00be..9a048980c 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -19,15 +19,13 @@
 
 #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"
@@ -47,7 +45,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 +62,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 ();
 	}
 	
@@ -75,8 +72,6 @@ Playlist::content_changed (weak_ptr<Content> content, int property, bool frequen
 void
 Playlist::maybe_sequence_video ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
 	if (!_sequence_video || _sequencing_video) {
 		return;
 	}
@@ -84,16 +79,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)) {
+	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;
 		}
 		
-		(*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() + 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 */
 	
 	_sequencing_video = false;
 }
@@ -101,8 +104,6 @@ Playlist::maybe_sequence_video ()
 string
 Playlist::video_identifier () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
 	string t;
 	
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
@@ -117,15 +118,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)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
-	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 ();
 }
 
@@ -133,8 +134,6 @@ Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node
 void
 Playlist::as_xml (xmlpp::Node* node)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
 	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
 		(*i)->as_xml (node->add_child ("Content"));
 	}
@@ -143,73 +142,50 @@ Playlist::as_xml (xmlpp::Node* node)
 void
 Playlist::add (shared_ptr<Content> c)
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_content.push_back (c);
-		reconnect ();
-	}
-	
+	_content.push_back (c);
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	reconnect ();
 	Changed ();
 }
 
 void
 Playlist::remove (shared_ptr<Content> c)
 {
-	bool changed = false;
-	
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		ContentList::iterator i = _content.begin ();
-		while (i != _content.end() && *i != c) {
-			++i;
-		}
-		
-		if (i != _content.end ()) {
-			_content.erase (i);
-			reconnect ();
-			changed = true;
-		}
+	ContentList::iterator i = _content.begin ();
+	while (i != _content.end() && *i != c) {
+		++i;
 	}
-
-	if (changed) {
+	
+	if (i != _content.end ()) {
+		_content.erase (i);
 		Changed ();
 	}
+
+	/* This won't change order, so it does not need a sort */
 }
 
 void
 Playlist::remove (ContentList c)
 {
-	bool changed = false;
-
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-			ContentList::iterator j = _content.begin ();
-			while (j != _content.end() && *j != *i) {
-				++j;
-			}
-			
-			if (j != _content.end ()) {
-				_content.erase (j);
-				changed = true;
-			}
+	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+		ContentList::iterator j = _content.begin ();
+		while (j != _content.end() && *j != *i) {
+			++j;
 		}
-
-		if (changed) {
-			reconnect ();
+	
+		if (j != _content.end ()) {
+			_content.erase (j);
 		}
 	}
 
-	if (changed) {
-		Changed ();
-	}
+	/* This won't change order, so it does not need a sort */
+	
+	Changed ();
 }
 
 bool
 Playlist::has_subtitles () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
 	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()) {
@@ -235,8 +211,6 @@ public:
 int
 Playlist::best_dcp_frame_rate () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
 	list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
 	/* Work out what rates we could manage, including those achieved by using skip / repeat. */
@@ -285,20 +259,17 @@ Playlist::best_dcp_frame_rate () const
 	return best->dcp;
 }
 
-Time
+DCPTime
 Playlist::length () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
-	Time len = 0;
+	DCPTime len;
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-		len = max (len, (*i)->end ());
+		len = max (len, (*i)->end() + DCPTime::delta ());
 	}
 
 	return len;
 }
 
-/* Caller must hold a lock on _mutex */
 void
 Playlist::reconnect ()
 {
@@ -313,12 +284,10 @@ Playlist::reconnect ()
 	}
 }
 
-Time
+DCPTime
 Playlist::video_end () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	
-	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 ());
@@ -328,10 +297,26 @@ Playlist::video_end () const
 	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) {
+			break;
+		}
+
+		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)
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	_sequence_video = s;
 }
 
@@ -345,35 +330,84 @@ ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
 ContentList
 Playlist::content () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	return _content;
 }
 
 void
 Playlist::repeat (ContentList c, int n)
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		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 ());
+		range.first = min (range.first, (*i)->end ());
+		range.second = max (range.second, (*i)->end ());
+	}
+
+	DCPTime pos = range.second;
+	for (int i = 0; i < n; ++i) {
 		for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-			range.first = min (range.first, (*i)->position ());
-			range.second = max (range.second, (*i)->position ());
-			range.first = min (range.first, (*i)->end ());
-			range.second = max (range.second, (*i)->end ());
+			shared_ptr<Content> copy = (*i)->clone ();
+			copy->set_position (pos + copy->position() - range.first);
+			_content.push_back (copy);
 		}
-		
-		Time 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 ();
-				copy->set_position (pos + copy->position() - range.first);
-				_content.push_back (copy);
-			}
-			pos += range.second - range.first;
-		}
-		
-		reconnect ();
+		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;
+	}
+	
+	DCPTime 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;
+	}
+
+	DCPTime const p = (*next)->position ();
+	(*next)->set_position (c->position ());
+	c->set_position (p + c->length_after_trim ());
+	sort (_content.begin(), _content.end(), ContentSorter ());
 	
 	Changed ();
 }