diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-25 22:51:18 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-25 22:51:18 +0200 |
| commit | ba9fb85168d004d7643dc02f911fd173a136758b (patch) | |
| tree | 8beb9b26c9bf47dfe933c8e0ccaccb4e30a69286 /src/lib/film.cc | |
| parent | d7cf091bdbbeae8187e887104d1135e93bcdf5da (diff) | |
Add NamedChannel and use it to hide the never-used channels
when mapping into a DCP.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index ea0a2bdd7..e2e77cce2 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1707,7 +1707,7 @@ Film::subtitle_language () const /** @return The names of the channels that audio contents' outputs are passed into; * this is either the DCP or a AudioProcessor. */ -vector<string> +vector<NamedChannel> Film::audio_output_names () const { if (audio_processor ()) { @@ -1716,10 +1716,12 @@ Film::audio_output_names () const DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16); - vector<string> n; + vector<NamedChannel> n; for (int i = 0; i < audio_channels(); ++i) { - n.push_back (short_audio_channel_name (i)); + if (i != 8 && i != 9 && i != 15) { + n.push_back (NamedChannel(short_audio_channel_name(i), i)); + } } return n; |