[asterisk-commits] newtonr: trunk r412589 - in /trunk: ./ sounds/Makefile sounds/sounds.xml
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Apr 18 12:17:38 CDT 2014
Author: newtonr
Date: Fri Apr 18 12:17:25 2014
New Revision: 412589
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412589
Log:
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
Modified:
trunk/ (props changed)
trunk/sounds/Makefile
trunk/sounds/sounds.xml
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.
Modified: trunk/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/Makefile?view=diff&rev=412589&r1=412588&r2=412589
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Fri Apr 18 12:17:25 2014
@@ -42,8 +42,8 @@
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,11 +152,9 @@
$(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)))
Modified: trunk/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/sounds.xml?view=diff&rev=412589&r1=412588&r2=412589
==============================================================================
--- trunk/sounds/sounds.xml (original)
+++ trunk/sounds/sounds.xml Fri Apr 18 12:17:25 2014
@@ -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>
- <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 name="CORE-SOUNDS-IT-WAV" displayname="Italian, WAV format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-ULAW" displayname="Italian, mu-Law format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-ALAW" displayname="Italian, a-Law format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-GSM" displayname="Italian, GSM format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-G729" displayname="Italian, G.729 format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-G722" displayname="Italian, G.722 format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-SLN16" displayname="Italian, Signed-linear 16kHz format">
+ <support_level>core</support_level>
+ </member>
+ <member name="CORE-SOUNDS-IT-SIREN7" displayname="Italian, G.722.1 (Siren7) format">
+ <support_level>core</support_level>
+ </member>
+ <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>
More information about the asterisk-commits
mailing list