Merged revisions 292225 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292225 | lmadsen | 2010-10-18 16:51:23 -0500 (Mon, 18 Oct 2010) | 24 lines

  Merged revisions 292224 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r292224 | lmadsen | 2010-10-18 16:50:47 -0500 (Mon, 18 Oct 2010) | 17 lines

    Merged revisions 292222 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r292222 | lmadsen | 2010-10-18 16:47:25 -0500 (Mon, 18 Oct 2010) | 9 lines

      Add support for the new English (Australian Accent) sound files.

      (closes issue #17426)
      Reported by: camsown
      Patches:
            core-sounds-en_AU.txt uploaded by camsown (license 1050)
            add_AU_sounds.patch.txt uploaded by lmadsen (license 10)
      Tested by: camsown, lmadsen, jtodd, qwell
    ........
  ................
................

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

diff --git a/sounds/Makefile b/sounds/Makefile
index 82a2f61..0945e67 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -19,11 +19,12 @@ CMD_PREFIX?=@
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.19
+CORE_SOUNDS_VERSION:=1.4.20
 EXTRA_SOUNDS_VERSION:=1.4.11
 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 -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
@@ -143,7 +144,7 @@ have_download:
                echo "***                                            ***"; \
                echo "*** Please install one of these, or remove any ***"; \
                echo "*** extra sound package selections in          ***"; \
-               echo "*** menuselecct before installing Asterisk.    ***"; \
+               echo "*** menuselect before installing Asterisk.     ***"; \
                echo "***                                            ***"; \
                echo "**************************************************"; \
                exit 1; \
@@ -151,6 +152,8 @@ have_download:
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))
 
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_AU,$(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)))
@@ -172,10 +175,10 @@ $(eval $(call sound_download_rule,moh))
 dist-clean:
        rm -f *.tar.gz
 
-$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
+$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
        $(INSTALL) -d $@
 
-install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
        rm -rf $(SOUNDS_DIR)

diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 192edab..c4b5a41 100644 (file)
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -54,6 +54,24 @@
                </member>
                <member name="CORE-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format">
                </member>
+               <member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format">
+               </member>
+               <member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
+               </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" >