From: Carl Hetherington <cth@carlh.net>
Date: Sat, 24 Mar 2018 23:55:56 +0000 (+0000)
Subject: Fix crash when changing DCP audio channel count.
X-Git-Tag: v2.13.2~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=800c0b9f95f422af66b6166fb4d13c1b89d04844;p=dcpomatic.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index d6eda2d91..0d5a87216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-03-24  Carl Hetherington  <cth@carlh.net>
 
+	* 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 bd194c373..6ec593f6c 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 ();
 	}
 }