Revert "Re-allow audio channel 15 to be mapped so that users can add"
authorCarl Hetherington <cth@carlh.net>
Tue, 3 Nov 2020 19:52:56 +0000 (20:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 3 Nov 2020 19:52:56 +0000 (20:52 +0100)
This reverts commit 4cf45229bf55344e708fead769f694f13bacf39c.
It's wrong - the sign language channel is 15 (1-indexed) not 15
(0-indexed) as in this commit.

src/lib/film.cc
src/lib/util.cc

index 5ee4cb34a65d7f79fb8975ab6df2129dbfd03d24..87037f51fb97169a6293e302d262e6aadc19e136 100644 (file)
@@ -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));
                }
        }
index 37b03c83605fa73c1131b6f15ee3216cd3bf2ecd..ac868c17360068a429de9f5dec93abca4534b49e 100644 (file)
@@ -592,7 +592,7 @@ short_audio_channel_name (int c)
                _("DBP"),
                _("DBS"),
                "",
-               _("Sign")
+               ""
        };
 
        return channels[c];