Fix method name confusion.

diff --git a/src/lib/piece.cc b/src/lib/piece.cc
index 879bf71c55a587310c59dd28233345a07770b336..03a92be6c3c0dc794942b02c640b95d1005828e9 100644 (file)
--- 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 ad9c939a49c997f7c35edf3a0edb3f3d2a7c9a95..c07fca20ee0515d0bab6640aa1259bbc243ac413 100644 (file)
--- 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 7e5ea1ba05a35590b4151cf42c4d7d3a49331773..7e96144bb82ede4e5c5e2e8be1880935d9b95cd6 100644 (file)
--- 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.
                   */