From: Carl Hetherington <cth@carlh.net>
Date: Tue, 3 Nov 2020 19:52:56 +0000 (+0100)
Subject: Revert "Re-allow audio channel 15 to be mapped so that users can add"
X-Git-Tag: v2.15.107~7
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=21e78df3645193f696873bdf29d39ea9f772395e

Revert "Re-allow audio channel 15 to be mapped so that users can add"

This reverts commit 4cf45229bf55344e708fead769f694f13bacf39c.
It's wrong - the sign language channel is 15 (1-indexed) not 15
(0-indexed) as in this commit.
---

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5ee4cb34a..87037f51f 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1722,7 +1722,7 @@ Film::audio_output_names () const
 	vector<NamedChannel> n;
 
 	for (int i = 0; i < audio_channels(); ++i) {
-		if (i != 8 && i != 9) {
+		if (i != 8 && i != 9 && i != 15) {
 			n.push_back (NamedChannel(short_audio_channel_name(i), i));
 		}
 	}
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 37b03c836..ac868c173 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -592,7 +592,7 @@ short_audio_channel_name (int c)
 		_("DBP"),
 		_("DBS"),
 		"",
-		_("Sign")
+		""
 	};
 
 	return channels[c];