summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-30 21:34:16 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-30 21:34:16 +0100
commitc57e92b12c64d4ad1a7f23876a97471565f9a252 (patch)
tree008213d35e4be34c55caa51760ab7aef6fa33113 /src/lib/playlist.cc
parente241b3d295fe4158239170f17391e08473e159c5 (diff)
Somewhat untested and sketchy basics of trimming.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e9ea3e3c7..de48ff5f5 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -72,7 +72,6 @@ Playlist::content_changed (weak_ptr<Content> content, int property, bool frequen
ContentChanged (content, property, frequent);
}
-
void
Playlist::maybe_sequence_video ()
{
@@ -90,7 +89,7 @@ Playlist::maybe_sequence_video ()
continue;
}
- (*i)->set_start (last);
+ (*i)->set_position (last);
last = (*i)->end ();
}
@@ -295,7 +294,7 @@ Playlist::set_sequence_video (bool s)
bool
ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
{
- return a->start() < b->start();
+ return a->position() < b->position();
}
/** @return content in an undefined order */
@@ -310,8 +309,8 @@ Playlist::repeat (ContentList c, int n)
{
pair<Time, Time> range (TIME_MAX, 0);
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- range.first = min (range.first, (*i)->start ());
- range.second = max (range.second, (*i)->start ());
+ range.first = min (range.first, (*i)->position ());
+ range.second = max (range.second, (*i)->position ());
range.first = min (range.first, (*i)->end ());
range.second = max (range.second, (*i)->end ());
}
@@ -320,7 +319,7 @@ Playlist::repeat (ContentList c, int n)
for (int i = 0; i < n; ++i) {
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
shared_ptr<Content> copy = (*i)->clone ();
- copy->set_start (pos + copy->start() - range.first);
+ copy->set_position (pos + copy->position() - range.first);
_content.push_back (copy);
}
pos += range.second - range.first;