diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-07-14 10:56:17 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-14 10:56:17 -0500 |
| commit | 3fd1d520f73a279b78e3bcfadc3ab7f829ff44c0 (patch) | |
| tree | bf38baaf6965ef2b2b7229c7baee16f2ed39a212 | |
| parent | a20703fd1b6957db2e446a59923f5faeef8f8bb7 (diff) | |
| parent | 3fbb4a0a0802ebc5f4b0c054479a08c845ed5815 (diff) | |
Merge "Sounds: Update for core sounds 1.6 release"
| -rw-r--r-- | sounds/Makefile | 5 | ||||
| -rw-r--r-- | sounds/sounds.xml | 27 |
2 files changed, 31 insertions, 1 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index 84d0f45c0..9dfd0c61c 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -19,13 +19,14 @@ CMD_PREFIX?=@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.5 +CORE_SOUNDS_VERSION:=1.6 EXTRA_SOUNDS_VERSION:=1.5 MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) MCS:=$(subst -EN_AU-,-en_AU-,$(MCS)) MCS:=$(subst -EN_GB-,-en_GB-,$(MCS)) +MCS:=$(subst -EN_NZ-,-en_NZ-,$(MCS)) MCS:=$(subst -FR-,-fr-,$(MCS)) MCS:=$(subst -ES-,-es-,$(MCS)) MCS:=$(subst -RU-,-ru-,$(MCS)) @@ -144,6 +145,8 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_AU,$(CORE_SOUN $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_GB,$(CORE_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_NZ,$(CORE_SOUNDS_VERSION))) + $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,es,$(CORE_SOUNDS_VERSION))) $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION))) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index 547be4b4a..2d996c57e 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -81,6 +81,33 @@ <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-EN_NZ-WAV" displayname="English (New Zealand Accent), WAV format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-ULAW" displayname="English (New Zealand Accent), mu-Law format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-ALAW" displayname="English (New Zealand Accent), a-Law format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-GSM" displayname="English (New Zealand Accent), GSM format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-G729" displayname="English (New Zealand Accent), G.729 format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-G722" displayname="English (New Zealand Accent), G.722 format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-SLN16" displayname="English (New Zealand Accent), Signed-linear 16kHz format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-SIREN7" displayname="English (New Zealand Accent), G.722.1 (Siren7) format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-EN_NZ-SIREN14" displayname="English (New Zealand 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> |