diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-30 10:11:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-30 10:11:01 +0100 |
| commit | 452a21994f6268faa159e53ead722a5bd5125b29 (patch) | |
| tree | dc5b8df6e4fa37209f3a6aed6d1f44c05f33a7c8 /src/lib | |
| parent | a65adcd8375ba5c57cfd0ba8f9a97edd0113a0fd (diff) | |
Remove call to fill_audio which goes wrong with multi-audio-stream content.
This call just doesn't take multi-stream into account. Removing it does
not trip any tests so I think it may be superfluous...
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 95ff55bc5..de221fef3 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -743,12 +743,6 @@ Player::audio_transform (shared_ptr<AudioContent> content, AudioStreamPtr stream content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ()); } - /* Pad any gap which may be caused by audio delay */ - - if (_last_audio_time) { - fill_audio (DCPTimePeriod (*_last_audio_time, time)); - } - /* Push */ _audio_merger.push (content_audio.audio, time); @@ -950,6 +944,8 @@ Player::fill_audio (DCPTimePeriod period) return; } + DCPOMATIC_ASSERT (period.from < period.to); + BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) { DCPTime t = i.from; while (t < i.to) { |