diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-24 13:59:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-01 16:43:36 +0100 |
| commit | fba5241b24e0b7ba7d428bbc1d34edbc239d6c58 (patch) | |
| tree | ecd9722ad7406044118b1b96e9f5254132b5e203 | |
| parent | b82caf0bab5aad9fbb952488d868491d26163bd7 (diff) | |
Fix method name confusion.
| -rw-r--r-- | src/lib/piece.cc | 2 | ||||
| -rw-r--r-- | src/lib/piece.h | 2 | ||||
| -rw-r--r-- | src/lib/player.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/piece.cc b/src/lib/piece.cc index 879bf71c5..03a92be6c 100644 --- a/src/lib/piece.cc +++ b/src/lib/piece.cc @@ -147,7 +147,7 @@ Piece::add_fonts (list<shared_ptr<Font> >& fonts) const optional<DCPTime> -Piece::position (shared_ptr<const Film> film) +Piece::decoder_position (shared_ptr<const Film> film) { if (_done) { return optional<DCPTime>(); diff --git a/src/lib/piece.h b/src/lib/piece.h index ad9c939a4..c07fca20e 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -42,7 +42,7 @@ public: void update_pull_to (dcpomatic::DCPTime& pull_to) const; void set_last_push_end (AudioStreamPtr stream, dcpomatic::DCPTime last_push_end); - boost::optional<dcpomatic::DCPTime> position (boost::shared_ptr<const Film> film); + boost::optional<dcpomatic::DCPTime> decoder_position (boost::shared_ptr<const Film> film); bool has_text () const; bool reference_audio () const; diff --git a/src/lib/player.cc b/src/lib/player.cc index 7e5ea1ba0..7e96144bb 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -557,7 +557,7 @@ Player::pass () optional<DCPTime> earliest_time; BOOST_FOREACH (shared_ptr<Piece> i, _pieces) { - optional<DCPTime> t = i->position (); + optional<DCPTime> t = i->decoder_position (_film); /* Given two choices at the same time, pick the one with texts so we see it before the video. */ |