diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-03 15:44:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-03 15:44:05 +0000 |
| commit | efa79a3db4a041cda3d93dde444e5dca9b84b976 (patch) | |
| tree | 8a7c9ebfef941d30ef0c6505f5614aaa6e3cc253 /src/lib/audio_decoder.cc | |
| parent | ac9648e018f06d11be985f55984f6afe8b6bb97e (diff) | |
| parent | 65c3b3a815545fef4d0373bb588eb815b8b544b0 (diff) | |
Fix alpha blending with with offset; should help with #1155.
Diffstat (limited to 'src/lib/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 5df4047db..4bd6535d8 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -98,7 +98,8 @@ AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, data = ro; } - _positions[stream] += Data(stream, ContentAudio (data, _positions[stream])).get_value_or(0); + Data(stream, ContentAudio (data, _positions[stream])); + _positions[stream] += data->frames(); } /** @return Time just after the last thing that was emitted from a given stream */ |