diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-05 15:58:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-05 15:58:50 +0000 |
| commit | f75cc4ebbffea7a7953af20e8a2ea124767bf949 (patch) | |
| tree | b483ddcf71280b73bdc11bc4865748e76b3857ff /src/lib/playlist.cc | |
| parent | 994ef64ef0cecd69898ab81432e5c5efef7ef97b (diff) | |
Various fixes to make tests pass again.
Diffstat (limited to 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 621b99dd7..c54b24c1c 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -82,14 +82,14 @@ Playlist::maybe_sequence_video () _sequencing_video = true; ContentList cl = _content; - Time last = 0; + Time next = 0; for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { if (!dynamic_pointer_cast<VideoContent> (*i)) { continue; } - (*i)->set_position (last); - last = (*i)->end (); + (*i)->set_position (next); + next = (*i)->end() + 1; } /* This won't change order, so it does not need a sort */ @@ -260,7 +260,7 @@ Playlist::length () const { Time len = 0; for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - len = max (len, (*i)->end ()); + len = max (len, (*i)->end() + 1); } return len; |
