sounds: Fix Sounds Makefile and XML that didn't support new sound prompt sets

In sounds/Makefile

 1 Adds and moves some lines necessary for the en_GB core set. I'm just following how the other sets are defined here.
 2 removes the ES extra sounds related lines as we don't have ES extra sound sets.

In sounds/sounds.xml

 3 Adds <support_level> definitions to all the sound sets as we have these defined in 11,12,Trunk, but not in 1.8
 4 Adds member definitons for EN_AU, EN_GB, IT for core sound sets, and EN_GB in extra sound sets

ASTERISK-23550
Reported by: Rusty Newton
Review: https://reviewboard.asterisk.org/r/3464/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@412585 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/sounds/Makefile b/sounds/Makefile
index 74444048724881489121e37dac03e1465fef13f0..6c330619bf4a1343253184d33569a1bc27177865 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -42,8 +42,8 @@ MCS:=$(subst -SIREN14,-siren14,$(MCS))
 CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
 CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
 MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
+MES:=$(subst -EN_GB-,-en_GB-,$(MES))
 MES:=$(subst -FR-,-fr-,$(MES))
-MES:=$(subst -ES-,-es-,$(MES))
 MES:=$(subst -WAV,-wav,$(MES))
 MES:=$(subst -ULAW,-ulaw,$(MES))
 MES:=$(subst -ALAW,-alaw,$(MES))
@@ -152,12 +152,10 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION)))
 
-$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,es,$(EXTRA_SOUNDS_VERSION)))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION)))
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUNDS_VERSION)))
 
-$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION)))
-
 $(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION)))
 
 dist-clean:

diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 9a1707d3217dc4df7d7b6c0e4ce055d15d90370c..5be259cfb0f6aecb80bcd4258b0c36f235cad0f1 100644 (file)
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -1,152 +1,305 @@
        <category name="MENUSELECT_CORE_SOUNDS" displayname="Core Sound Packages" positive_output="yes">
                <member name="CORE-SOUNDS-EN-WAV" displayname="English, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
                        <defaultenabled>yes</defaultenabled>
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-SIREN7" displayname="English, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-EN-SIREN14" displayname="English, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-WAV" displayname="English (British Accent), WAV format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-ULAW" displayname="English (British Accent), mu-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-ALAW" displayname="English (British Accent), a-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-GSM" displayname="English (British Accent), GSM format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-G729" displayname="English (British Accent), G.729 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-G722" displayname="English (British Accent), G.722 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-SLN16" displayname="English (British Accent), Signed-linear 16kHz format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-SIREN7" displayname="English (British Accent), G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-EN_GB-SIREN14" displayname="English (British Accent), G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-ALAW" displayname="Spanish, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-GSM" displayname="Spanish, GSM format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-G722" displayname="Spanish, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-SLN16" displayname="Spanish, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-SIREN7" displayname="Spanish, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-ES-SIREN14" displayname="Spanish, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-ALAW" displayname="French, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-SIREN7" displayname="French, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format">
+               <member name="CORE-SOUNDS-IT-WAV" displayname="Italian, WAV format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format">
+               <member name="CORE-SOUNDS-IT-ULAW" displayname="Italian, mu-Law format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format">
+               <member name="CORE-SOUNDS-IT-ALAW" displayname="Italian, a-Law format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format">
+               <member name="CORE-SOUNDS-IT-GSM" displayname="Italian, GSM format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format">
+               <member name="CORE-SOUNDS-IT-G729" displayname="Italian, G.729 format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format">
+               <member name="CORE-SOUNDS-IT-G722" displayname="Italian, G.722 format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format">
+               <member name="CORE-SOUNDS-IT-SLN16" displayname="Italian, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format">
+               <member name="CORE-SOUNDS-IT-SIREN7" displayname="Italian, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
-               <member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
+               <member name="CORE-SOUNDS-IT-SIREN14" displayname="Italian, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-WAV" displayname="Russian, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-ULAW" displayname="Russian, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-ALAW" displayname="Russian, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-GSM" displayname="Russian, GSM format" >
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-G729" displayname="Russian, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-G722" displayname="Russian, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-SLN16" displayname="Russian, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-SIREN7" displayname="Russian, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="CORE-SOUNDS-RU-SIREN14" displayname="Russian, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
        </category>
        <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
                <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
                        <defaultenabled>yes</defaultenabled>
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-ALAW" displayname="opsound.org Music On Hold Files, a-Law format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-GSM" displayname="opsound.org Music On Hold Files, GSM format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-SIREN7" displayname="opsound.org Music On Hold Files, G.722.1 (Siren7) format" >
+                       <support_level>core</support_level>
                </member>
                <member name="MOH-OPSOUND-SIREN14" displayname="opsound.org Music On Hold Files, G.722.1C (Siren14) format" >
+                       <support_level>core</support_level>
                </member>
        </category>
        <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
                <member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" >
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-SIREN7" displayname="English, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-EN-SIREN14" displayname="English, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-WAV" displayname="English (British Accent), WAV format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-ULAW" displayname="English (British Accent), mu-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-ALAW" displayname="English (British Accent), a-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-GSM" displayname="English (British Accent), GSM format" >
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-G729" displayname="English (British Accent), G.729 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-G722" displayname="English (British Accent), G.722 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-SLN16" displayname="English (British Accent), Signed-linear 16kHz format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-SIREN7" displayname="English (British Accent), G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="EXTRA-SOUNDS-EN_GB-SIREN14" displayname="English (British Accent), G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-WAV" displayname="French, WAV format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-ALAW" displayname="French, a-Law format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-GSM" displayname="French, GSM format" >
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-G729" displayname="French, G.729 format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-G722" displayname="French, G.722 format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-SIREN7" displayname="French, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
                </member>
                <member name="EXTRA-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
                </member>
        </category>