X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=1698da99ef25ace321b80954c8a4239a7105090b;hb=ed60129bb2051649de3740ff75a7db71db9e7897;hp=5203160a876373258748e6c7b0f0663c3375d66c;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 5203160a8..1698da99e 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -40,7 +40,6 @@ using std::vector;
 using std::min;
 using std::max;
 using std::string;
-using std::stringstream;
 using std::pair;
 using boost::optional;
 using boost::shared_ptr;
@@ -63,6 +62,12 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
+	/* Don't respond to position changes here, as:
+	   - sequencing after earlier/later changes is handled by move_earlier/move_later
+	   - any other position changes will be timeline drags which should not result in content
+	   being sequenced.
+	*/
+	
 	if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
 		maybe_sequence_video ();
 	}
@@ -186,19 +191,6 @@ Playlist::remove (ContentList c)
 	Changed ();
 }
 
-bool
-Playlist::has_subtitles () const
-{
-	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()) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 class FrameRateCandidate
 {
 public:
@@ -306,7 +298,7 @@ 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;
+			continue;
 		}
 
 		if (vc->position() >= t && t < vc->end()) {
@@ -375,17 +367,16 @@ Playlist::move_earlier (shared_ptr<Content> c)
 		++i;
 	}
 
-	assert (i != _content.end ());
+	DCPOMATIC_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
@@ -398,7 +389,7 @@ Playlist::move_later (shared_ptr<Content> c)
 		++i;
 	}
 
-	assert (i != _content.end ());
+	DCPOMATIC_ASSERT (i != _content.end ());
 
 	ContentList::iterator next = i;
 	++next;
@@ -407,10 +398,7 @@ Playlist::move_later (shared_ptr<Content> c)
 		return;
 	}
 
-	DCPTime const p = (*next)->position ();
 	(*next)->set_position (c->position ());
-	c->set_position (p + c->length_after_trim ());
+	c->set_position (c->position() + (*next)->length_after_trim ());
 	sort (_content.begin(), _content.end(), ContentSorter ());
-	
-	Changed ();
 }