diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-25 17:53:13 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-07 09:29:59 +0200 |
| commit | 36f8753fa7827deda6af29ffe828a8e6d22273c0 (patch) | |
| tree | a8c7b62402cc88423ee87b6f775d87a1e16fdcd7 | |
| parent | 65f773f8aad39558b69e8cc73ab4e9bef419496d (diff) | |
Make Piece::done private.
| -rw-r--r-- | src/lib/piece.cc | 14 | ||||
| -rw-r--r-- | src/lib/piece.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/piece.cc b/src/lib/piece.cc index 54d37f453..16fcb32bc 100644 --- a/src/lib/piece.cc +++ b/src/lib/piece.cc @@ -54,7 +54,7 @@ Piece::Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f) void Piece::update_pull_to (DCPTime& pull_to) const { - if (done) { + if (_done) { return; } @@ -197,7 +197,7 @@ void Piece::pass () { LOG_DEBUG_PLAYER ("Calling pass() on %1", _content->path(0)); - done = decoder->pass(); + _done = decoder->pass(); } @@ -219,14 +219,14 @@ Piece::seek (shared_ptr<const Film> film, DCPTime time, bool accurate) been trimmed to a point between keyframes, or something). */ decoder->seek (dcp_to_content_time(position(), film), true); - done = false; + _done = false; } else if (position() <= time && time < end(film)) { /* During; seek to position */ decoder->seek (dcp_to_content_time(time, film), accurate); - done = false; + _done = false; } else { /* After; this piece is done */ - done = true; + _done = true; } } @@ -234,7 +234,7 @@ Piece::seek (shared_ptr<const Film> film, DCPTime time, bool accurate) optional<dcpomatic::DCPTime> Piece::decoder_before(shared_ptr<const Film> film, optional<dcpomatic::DCPTime> time) { - if (done) { + if (_done) { return {}; } @@ -242,7 +242,7 @@ Piece::decoder_before(shared_ptr<const Film> film, optional<dcpomatic::DCPTime> DCPOMATIC_ASSERT (t); if (*t > end(film)) { - done = true; + _done = true; } else { /* Given two choices at the same time, pick the one with texts so we see it before the video. diff --git a/src/lib/piece.h b/src/lib/piece.h index c567a2f7c..8f4b91f22 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -75,13 +75,13 @@ public: std::shared_ptr<Decoder> decoder; boost::optional<dcpomatic::DCPTimePeriod> ignore_video; - bool done = false; private: friend struct overlap_video_test1; std::shared_ptr<Content> _content; FrameRateChange _frc; + bool _done = false; std::map<AudioStreamPtr, dcpomatic::DCPTime> _stream_last_push_end; }; |
