diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-09 15:49:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-09 15:49:32 +0100 |
| commit | ca63531ff0233410311cc31b2df8ea523bdaf524 (patch) | |
| tree | 816e684dec99044f4de9707506f20826d0fecd62 | |
| parent | 78cece0461b94e5ffc4417f0228e0ad528ad8efe (diff) | |
Sequence content after trim changes (#1327). This gives me a slight
sense of unease but let's see how it goes.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/playlist.cc | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -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 d2ac95cd3..3376a55ea 100644 --- 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 |