diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-12 15:21:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-12 15:21:31 +0100 |
| commit | 2517ec798da291dedc02dd7a7a432f7aa63133e4 (patch) | |
| tree | 275fdd498846450725f4400ebb5863ba2a5ac15c /src/lib/player.cc | |
| parent | 7698ee82874ee9cb5fa4b251a0a7e7e2df81fcfb (diff) | |
Add some tests; fix failure to make DCP when there is a bit of audio right at the end of the film (with no corresponding video).
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index adaee931e..3ed0e4f45 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -156,8 +156,8 @@ Player::setup_pieces () } } - _black = Empty (_playlist, bind(&Content::video, _1)); - _silent = Empty (_playlist, bind(&Content::audio, _1)); + _black = Empty (_film, bind(&Content::video, _1)); + _silent = Empty (_film, bind(&Content::audio, _1)); _last_video_time = DCPTime (); _last_audio_time = DCPTime (); @@ -552,7 +552,7 @@ Player::pass () /* Emit any audio that is ready */ - DCPTime pull_to = _playlist->length (); + DCPTime pull_to = _film->length (); for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) { if (!i->second.piece->done && i->second.last_push_end < pull_to) { pull_to = i->second.last_push_end; |