diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-10 20:38:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-10 20:38:28 +0100 |
| commit | 8d58a7c5f4320ad5c111e336c45e44d6b51ab509 (patch) | |
| tree | 9db468c1c7fc8bb960c382ba39e5d3b292745254 /src/lib | |
| parent | 669db59c74217a2ccb6a77d02558907c3e1705a9 (diff) | |
| parent | 46f9949259a5402267d1f2809101b4f8c371dc70 (diff) | |
Merge master.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/playlist.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 1c65d1326..16c740943 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -393,7 +393,6 @@ Playlist::move_later (shared_ptr<Content> c) return; } - DCPTime const p = (*next)->position (); (*next)->set_position (c->position ()); c->set_position (c->position() + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); |