From 7b16280edec019d0583b52fab25549a91c3676e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 24 Mar 2018 23:55:56 +0000 Subject: Fix crash when changing DCP audio channel count. Without this we ask the AudioMerger to merge new buffers with N channels with old buffers with M channels, which it can't do. I'm not convinced this is the best solution but I think it will do for now. --- ChangeLog | 2 ++ src/lib/player.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 481cd16dc..22eba9726 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2018-03-24 Carl Hetherington + * Fix crash when changing DCP audio channel count (#1253). + * Fix update checker error when there is no test version. diff --git a/src/lib/player.cc b/src/lib/player.cc index e8005c655..7e2f8ad08 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -283,6 +283,8 @@ Player::film_changed (Film::Property p) if (_film->audio_processor ()) { _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); } + } else if (p == Film::AUDIO_CHANNELS) { + _audio_merger.clear (); } } -- cgit v1.2.3