projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5f8fbb
)
Fix incorrect behaviour of Playlist::move_later.
author
Carl Hetherington
<cth@carlh.net>
Fri, 27 Jun 2014 12:22:42 +0000
(13:22 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 27 Jun 2014 12:22:42 +0000
(13:22 +0100)
src/lib/playlist.cc
patch
|
blob
|
history
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index e847e623baf00d9f73150cc005c6e074dca4f4e6..df3e633036f174fe609f192f3f3eba370eed062f 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-362,6
+362,7
@@
Playlist::move_earlier (shared_ptr<Content> c)
if (previous == _content.end ()) {
return;
}
+
Time const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
@@
-390,7
+391,7
@@
Playlist::move_later (shared_ptr<Content> c)
Time 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 ());
}