diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-11 14:46:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-11 14:46:52 +0100 |
| commit | 081f974c2c75c306d07d5a6f5da6847826a05a9c (patch) | |
| tree | f3c77f02b24b0d835efc6a61a8fe86bc3dd6a970 /src/lib/player.cc | |
| parent | b242f871b4da75572bb0d5bf111ae6103bf669b7 (diff) | |
Remove unused Player::_ignore_audio. Ignore position
of things that we are ignoring; this fixes strange behaviour (delays)
when analysing audio as it used to keep pass()ing decoders to get
data that would never come.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index fb9e208fa..adaee931e 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -82,7 +82,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist , _playlist (playlist) , _have_valid_pieces (false) , _ignore_video (false) - , _ignore_audio (false) + , _ignore_subtitle (false) , _always_burn_subtitles (false) , _fast (false) , _play_referenced (false) @@ -121,8 +121,8 @@ Player::setup_pieces () decoder->video->set_ignore (); } - if (decoder->audio && _ignore_audio) { - decoder->audio->set_ignore (); + if (decoder->subtitle && _ignore_subtitle) { + decoder->subtitle->set_ignore (); } shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder); @@ -406,6 +406,12 @@ Player::set_ignore_video () _ignore_video = true; } +void +Player::set_ignore_subtitle () +{ + _ignore_subtitle = true; +} + /** Set whether or not this player should always burn text subtitles into the image, * regardless of the content settings. * @param burn true to always burn subtitles, false to obey content settings. |