From 06657c92e61340a9bc3e0d89fa676f93e6581ef1 Mon Sep 17 00:00:00 2001 From: Rusty Newton <rnewton@digium.com> Date: Fri, 18 Apr 2014 17:17:25 +0000 Subject: [PATCH] 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 member definitons for EN_AU, EN_GB, IT for core sound sets, and EN_GB in extra sound sets ASTERISK-23550 #close Review: https://reviewboard.asterisk.org/r/3464/ ........ Merged revisions 412586 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 412587 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412589 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- sounds/Makefile | 6 +-- sounds/sounds.xml | 117 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 101 insertions(+), 22 deletions(-) diff --git a/sounds/Makefile b/sounds/Makefile index de60ef2f4f..87b356f430 100644 --- 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 4b234ec0a4..768ddde638 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -27,6 +27,60 @@ <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> @@ -81,32 +135,32 @@ <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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"> - <support_level>core</support_level> + <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> @@ -194,6 +248,33 @@ <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> -- GitLab