diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-05 14:43:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-05 14:43:12 +0000 |
| commit | bbd5444a9eb98b52136327dad0744b4c62a88ab2 (patch) | |
| tree | 77e0984bccce32a36746dd0d342937565b3d2376 /src/lib | |
| parent | e60d56f2e25140a6c477b9c84595e7a8bad4d1e5 (diff) | |
Bump maximum audio channels to 12 so that we can (crudely) use
BsL/BsR.
Requested-by: Markus Raab
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/util.cc | 10 | ||||
| -rw-r--r-- | src/lib/util.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 48b418d37..35385ab40 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -792,7 +792,7 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl string audio_channel_name (int c) { - assert (MAX_AUDIO_CHANNELS == 8); + assert (MAX_AUDIO_CHANNELS == 12); /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency enhancement channel (sub-woofer). HI is the hearing-impaired audio track and @@ -805,8 +805,12 @@ audio_channel_name (int c) _("Lfe (sub)"), _("Left surround"), _("Right surround"), - _("HI"), - _("VI") + _("Hearing impaired"), + _("Visually impaired"), + _("Left centre"), + _("Right centre"), + _("Left rear surround"), + _("Right rear surround"), }; return channels[c]; diff --git a/src/lib/util.h b/src/lib/util.h index fc17dc944..c05680859 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -49,7 +49,7 @@ extern "C" { #undef check /** The maximum number of audio channels that we can cope with */ -#define MAX_AUDIO_CHANNELS 8 +#define MAX_AUDIO_CHANNELS 12 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way" |