Sequence content after trim changes (#1327). This gives me a slight

sense of unease but let's see how it goes.

diff --git a/ChangeLog b/ChangeLog
index e51168502031404de19edf04051bb429617a1afb..8804ff1b85b8f56bc0c73bcded4261adfd204afb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-07-09  Carl Hetherington  <cth@carlh.net>
 
+       * Maintain content sequence after trim (#1327).
+
        * Keep video content position and trim on frame boundaries
        even if the content's frame rate is forced to a new value (#1335).
 

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index d2ac95cd388f4bae20451adf22407fc9cd849ead..3376a55eab9079b2c422381578401e77c6976919 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -67,7 +67,12 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-       if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) {
+       if (
+               property == ContentProperty::TRIM_START ||
+               property == ContentProperty::TRIM_END ||
+               property == ContentProperty::LENGTH ||
+               property == VideoContentProperty::FRAME_TYPE
+               ) {
                /* 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