summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-18 19:13:30 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-18 19:13:30 +0100
commit69efa47dbd1684c897f780c80fd68bdc05c817f4 (patch)
treec2395218844d9d5d827f4a6743e5edf51e9b58fe /src/lib/player.cc
parent221555777b72932c6d9eccdbc37e5b8c1be9d62e (diff)
Rename next -> position in decoders.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 6d7c3cfbd..60686e781 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -97,7 +97,7 @@ Player::pass ()
for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
cout << "check " << (*i)->content->file()
<< " start=" << (*i)->content->start()
- << ", next=" << (*i)->decoder->next()
+ << ", position=" << (*i)->decoder->position()
<< ", end=" << (*i)->content->end() << "\n";
if ((*i)->decoder->done ()) {
@@ -108,7 +108,7 @@ Player::pass ()
continue;
}
- Time const t = (*i)->content->start() + (*i)->decoder->next();
+ Time const t = (*i)->content->start() + (*i)->decoder->position();
if (t < earliest_t) {
cout << "\t candidate; " << t << " " << (t / TIME_HZ) << ".\n";
earliest_t = t;
@@ -136,7 +136,7 @@ Player::pass ()
}
earliest->decoder->pass ();
- _position = earliest->content->start() + earliest->decoder->next ();
+ _position = earliest->content->start() + earliest->decoder->position ();
cout << "\tpassed to " << _position << " " << (_position / TIME_HZ) << "\n";
return false;