diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-30 13:57:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-30 13:57:52 +0100 |
| commit | 74fe68e5895654e27a7cf8097917c1e95fa89519 (patch) | |
| tree | 8afd88ce9f43293798dfb8018d024adac09388c2 /src/lib | |
| parent | 3c2a72e6e1d4fa47490155a0d6f5e9c5a3a17f68 (diff) | |
| parent | 7d93aa13507094e87bc9086986b36edd96a613b0 (diff) | |
Merge master.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/playlist.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 710b9cc09..1c65d1326 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -366,6 +366,7 @@ 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 ()); @@ -394,6 +395,6 @@ Playlist::move_later (shared_ptr<Content> c) DCPTime const p = (*next)->position (); (*next)->set_position (c->position ()); - c->set_position (p + c->length_after_trim ()); + c->set_position (c->position() + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); } |