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/decoder.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/decoder.cc')
| -rw-r--r-- | src/lib/decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 1281897e0..0d4f4babf 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -34,15 +34,15 @@ Decoder::position () const { optional<ContentTime> pos; - if (video && (!pos || video->position() < *pos)) { + if (video && !video->ignore() && (!pos || video->position() < *pos)) { pos = video->position(); } - if (audio && (!pos || audio->position() < *pos)) { + if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) { pos = audio->position(); } - if (subtitle && (!pos || subtitle->position() < *pos)) { + if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) { pos = subtitle->position(); } |