diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:57:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:57:06 +0200 |
| commit | a4930f8185f2d3f3a9dc93b938792fae758be4d7 (patch) | |
| tree | f3813d7b4be91718edfc73ad45aba46447b3e99c /src | |
| parent | 9b9af8a80860210c6a29446f7a24795eeda9e7bc (diff) | |
| parent | 47b82590f5d1538b599e323daa5e0c792e4d4695 (diff) | |
Merge branch 'main' into v1.9.xv1.9.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/types.cc | 6 | ||||
| -rw-r--r-- | src/types.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/types.cc b/src/types.cc index c4ba8886..d58256a5 100644 --- a/src/types.cc +++ b/src/types.cc @@ -547,11 +547,15 @@ dcp::mca_id_to_channel (string id) return Channel::HI; } else if (id == "vin" || id == "vi-n") { return Channel::VI; + } else if (id == "lc") { + return Channel::LC; + } else if (id == "rc") { + return Channel::RC; } else if (id == "lrs" || id == "lsr") { return Channel::BSL; } else if (id == "rrs" || id == "rsr") { return Channel::BSR; - } else if (id == "dbox") { + } else if (id == "dbox" || id == "mtn") { return Channel::MOTION_DATA; } else if (id == "sync" || id == "fsksync") { return Channel::SYNC_SIGNAL; diff --git a/src/types.h b/src/types.h index 183ce638..65840e6d 100644 --- a/src/types.h +++ b/src/types.h @@ -99,7 +99,8 @@ enum class Channel { RS = 5, ///< right surround HI = 6, VI = 7, - /* 8 and 9 are not used */ + LC = 8, ///< not used, but referred to in MainSoundConfiguration in some CPLs + RC = 9, ///< not used, but referred to in MainSoundConfiguration in some CPLs BSL = 10, BSR = 11, MOTION_DATA = 12, |