X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=4580e54d400e40e9fc59f7eaebec9bd806f8520d;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=1c268ca110a90a42f7997e94d46ffd1a13ff4483;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 1c268ca11..4580e54d4 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 ();
 	}
@@ -366,13 +371,12 @@ Playlist::move_earlier (shared_ptr<Content> c)
 	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
@@ -394,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 ();
 }