Remove now-presumed-wrong 2.0 MCA sound field.

diff --git a/src/types.cc b/src/types.cc
index 9b1aca31635e2663356da5949dedbac06aa8587c..153a73afb180187f6511e3d9257ec388831284cd 100644 (file)
--- 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 6c40c37db6dad8b732f521bc1443a1e265e13652..5f955c4b119f4b07697757fc6e6538ecc630642f 100644 (file)
--- 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 ca8f8c5d29ddb359c1b4b8e19fdc4392228049b7..20470c1da405f72b652cd3b21e71ddfceff79a7d 100644 (file)
--- 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;