adm: don't have _st2131 suffix on adm property names

bbc · Dec 8, 2023 · 5d768c1 · 5d768c1
1 parent 632e4c6
commit 5d768c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/apps/AppMCALabelHelper.cpp b/src/apps/AppMCALabelHelper.cpp
@@ -247,12 +247,9 @@ struct MCAPropertyMapEntry {
    {"rfc5646additionalspokenlanguages", PROPERTY_FUNCTION_REFS(RFC5646AdditionalSpokenLanguages)},
    {"mcaadditionallanguageattributes", PROPERTY_FUNCTION_REFS(MCAAdditionalLanguageAttributes)},
    // ADM propertues will be identified by the "adm" prefix in AppMCALabelHelper
-   {"admaudioprogrammeidst2131", PROPERTY_FUNCTION_REFS(ADMAudioProgrammeID_ST2131)},
-   {"admaudioprogrammeid", PROPERTY_FUNCTION_REFS(ADMAudioProgrammeID_ST2131)},  // without "st2131" suffix
-   {"admaudiocontentidst2131", PROPERTY_FUNCTION_REFS(ADMAudioContentID_ST2131)},
-   {"admaudiocontentid", PROPERTY_FUNCTION_REFS(ADMAudioContentID_ST2131)},  // without "st2131" suffix
-   {"admaudioobjectidst2131", PROPERTY_FUNCTION_REFS(ADMAudioObjectID_ST2131)},
-   {"admaudioobjectid", PROPERTY_FUNCTION_REFS(ADMAudioObjectID_ST2131)},  // without "st2131" suffix
+   {"admaudioprogrammeid", PROPERTY_FUNCTION_REFS(ADMAudioProgrammeID_ST2131)},
+   {"admaudiocontentid", PROPERTY_FUNCTION_REFS(ADMAudioContentID_ST2131)},
+   {"admaudioobjectid", PROPERTY_FUNCTION_REFS(ADMAudioObjectID_ST2131)},
 };
 
 

diff --git a/test/wave_adm/mca_1.txt b/test/wave_adm/mca_1.txt
@@ -2,11 +2,10 @@
 chL, chan=0
 chR, chan=1
 sgST, lang=eng, mca_title="Test Example 1"
-# Also testing using short ADM MCA property names without the "st2131" suffix
 ADM, chunk_id=axml, adm_audio_programme_id="APR_1001", adm_audio_content_id="ACO_1001", adm_audio_object_id="AO_1001"
 
 1
 chL, chan=0
 chR, chan=1
 sgST, lang=eng, mca_title="Test Example 1"
-ADM, chunk_id=axml, adm_audio_programme_id_st2131="APR_1001", adm_audio_content_id_st2131="ACO_1002", adm_audio_object_id_st2131="AO_1002"
+ADM, chunk_id=axml, adm_audio_programme_id="APR_1001", adm_audio_content_id="ACO_1002", adm_audio_object_id="AO_1002"