diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 02:45:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 02:45:30 +0000 |
| commit | 84012cdd64f451891febd36154b7226ea21a899b (patch) | |
| tree | 096fb898aa14d936dfc8f8598a6908337508233c /src/lib/player.cc | |
| parent | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (diff) | |
Put Film pointer into Decoder.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 283a641d9..80b9744d8 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -480,7 +480,7 @@ Player::get_reel_assets () scoped_ptr<DCPDecoder> decoder; try { - decoder.reset (new DCPDecoder (j, false)); + decoder.reset (new DCPDecoder (_film, j, false)); } catch (...) { return a; } @@ -570,7 +570,7 @@ Player::pass () continue; } - DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(_film), i->content->trim_start())); + DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start())); if (t > i->content->end(_film)) { i->done = true; } else { @@ -610,7 +610,7 @@ Player::pass () switch (which) { case CONTENT: - earliest_content->done = earliest_content->decoder->pass (_film); + earliest_content->done = earliest_content->decoder->pass (); break; case BLACK: emit_video (black_player_video_frame(EYES_BOTH), _black.position()); @@ -1024,11 +1024,11 @@ Player::seek (DCPTime time, bool accurate) BOOST_FOREACH (shared_ptr<Piece> i, _pieces) { if (time < i->content->position()) { /* Before; seek to the start of the content */ - i->decoder->seek (_film, dcp_to_content_time (i, i->content->position()), accurate); + i->decoder->seek (dcp_to_content_time (i, i->content->position()), accurate); i->done = false; } else if (i->content->position() <= time && time < i->content->end(_film)) { /* During; seek to position */ - i->decoder->seek (_film, dcp_to_content_time (i, time), accurate); + i->decoder->seek (dcp_to_content_time (i, time), accurate); i->done = false; } else { /* After; this piece is done */ |