diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-23 22:32:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-23 22:32:45 +0200 |
| commit | 38864bb7af746e9b621bd6db4b882da0f39314dd (patch) | |
| tree | 715db6e8c9ba095b07f6aa5a4b2faa846b5114af /src | |
| parent | 206e5213c74c848f0b6dc46f879cabe30a436e51 (diff) | |
Hide unused audio channels a bit more clearly, not giving them
names any more. Add dcp::used_audio_channels().
Diffstat (limited to 'src')
| -rw-r--r-- | src/types.cc | 21 | ||||
| -rw-r--r-- | src/types.h | 7 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/types.cc b/src/types.cc index 669d4fca..2bcd7101 100644 --- a/src/types.cc +++ b/src/types.cc @@ -841,3 +841,24 @@ dcp::channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dict } +vector<dcp::Channel> +dcp::used_audio_channels () +{ + vector<dcp::Channel> c; + c.push_back (LEFT); + c.push_back (RIGHT); + c.push_back (CENTRE); + c.push_back (LFE); + c.push_back (LS); + c.push_back (RS); + c.push_back (HI); + c.push_back (VI); + c.push_back (BSL); + c.push_back (BSR); + c.push_back (MOTION_DATA); + c.push_back (SYNC_SIGNAL); + c.push_back (SIGN_LANGUAGE); + c.push_back (dcp::LEFT); + return c; +} + diff --git a/src/types.h b/src/types.h index ed0b7b84..684145dd 100644 --- a/src/types.h +++ b/src/types.h @@ -88,17 +88,18 @@ enum Channel { RS = 5, ///< right surround HI = 6, VI = 7, - LC = 8, - RC = 9, + /* 8 and 9 are not used */ BSL = 10, BSR = 11, MOTION_DATA = 12, SYNC_SIGNAL = 13, SIGN_LANGUAGE = 14, - UNUSED = 15, + /* 15 is not used */ CHANNEL_COUNT = 16 }; +std::vector<dcp::Channel> used_audio_channels (); + enum MCASoundField { |