From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Jul 2013 20:48:02 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.0.48~1337^2~231
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=adf17c5e1992186c7f8d63d9cffd087311164ffa

Merge.
---

adf17c5e1992186c7f8d63d9cffd087311164ffa
diff --cc src/lib/playlist.cc
index aea6c5f41,0d6462f6c..028b2b880
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@@ -75,15 -75,15 +75,40 @@@ Playlist::content_changed (weak_ptr<Con
  	if (p == ContentProperty::LENGTH) {
  		maybe_sequence_video ();
  	}
++<<<<<<< HEAD
 +	
 +	ContentChanged (c, p);
 +}
 +
++=======
+ 
+ 	ContentChanged (c, p);
+ }
+ 
++>>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
  void
  Playlist::maybe_sequence_video ()
  {
  	if (!_sequence_video || _sequencing_video) {
  		return;
++<<<<<<< HEAD
++	}
++	
++	_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)) {
++			continue;
++		}
++		
++		(*i)->set_start (last);
++		last = (*i)->end ();
++	}
++	
++=======
  	}
  	
  	_sequencing_video = true;
@@@ -100,6 -100,6 +125,7 @@@
  		last = (*i)->end ();
  	}
  	
++>>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
  	_sequencing_video = false;
  }