From 0d65e6ab06f798ca905c0ae5c1d0203ac254377c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Jun 2015 12:02:29 +0100
Subject: Un-map non-selected audio streams when loading old files.

---
 src/lib/ffmpeg_content.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9dc4afab9..608c8cdb7 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -79,6 +79,10 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, cxml::ConstNodePtr node,
 	c = node->node_children ("AudioStream");
 	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
 		_audio_streams.push_back (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (*i, version)));
+		if (version < 11 && !(*i)->optional_node_child ("Selected")) {
+			/* This is an old file and this stream is not selected, so un-map it */
+			_audio_streams.back()->set_mapping (AudioMapping (_audio_streams.back()->channels (), MAX_DCP_AUDIO_CHANNELS));
+		}
 	}
 
 	c = node->node_children ("Filter");
-- 
cgit v1.2.3