diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-03-17 14:54:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-03-20 16:41:02 +0100 |
| commit | 06adefd20b469b5f7fefaa4e5c97c30e8992e8b1 (patch) | |
| tree | 8863955f4fe82c536b7e6318b29f4c08b64f87af | |
| parent | 20e3e4c2a7a91e45740987a702f5d4c1ea2f9030 (diff) | |
Remove now-presumed-wrong 2.0 MCA sound field.
| -rw-r--r-- | src/types.cc | 10 | ||||
| -rw-r--r-- | src/types.h | 1 | ||||
| -rw-r--r-- | test/stream_operators.cc | 3 |
3 files changed, 1 insertions, 13 deletions
diff --git a/src/types.cc b/src/types.cc index 9b1aca31..153a73af 100644 --- a/src/types.cc +++ b/src/types.cc @@ -477,12 +477,7 @@ MainSoundConfiguration::MainSoundConfiguration (string s) throw MainSoundConfigurationError (s); } - if (parts[0] == "20") { - /* I can't find any mention in the standard of 20 being OK here, but Deluxe fail - * QCs if the audio is stereo and 51 is used here. - */ - _field = MCASoundField::STEREO; - } else if (parts[0] == "51") { + if (parts[0] == "51") { _field = MCASoundField::FIVE_POINT_ONE; } else if (parts[0] == "71") { _field = MCASoundField::SEVEN_POINT_ONE; @@ -519,9 +514,6 @@ MainSoundConfiguration::to_string () const { string c; switch (_field) { - case MCASoundField::STEREO: - c = "20/"; - break; case MCASoundField::FIVE_POINT_ONE: c = "51/"; break; diff --git a/src/types.h b/src/types.h index 6c40c37d..5f955c4b 100644 --- a/src/types.h +++ b/src/types.h @@ -118,7 +118,6 @@ std::vector<dcp::Channel> used_audio_channels (); enum class MCASoundField { - STEREO, FIVE_POINT_ONE, SEVEN_POINT_ONE }; diff --git a/test/stream_operators.cc b/test/stream_operators.cc index ca8f8c5d..20470c1d 100644 --- a/test/stream_operators.cc +++ b/test/stream_operators.cc @@ -175,9 +175,6 @@ ostream& dcp::operator<< (ostream& s, MCASoundField f) { switch (f) { - case MCASoundField::STEREO: - s << "2.0"; - break; case MCASoundField::FIVE_POINT_ONE: s << "5.1"; break; |