From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 25 Oct 2006 17:12:59 +0000 (+0000)
Subject: Merged revisions 46237 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f84fdd2939690bf0a9c3c0895988a17275771a;p=thirdparty%2Fasterisk.git

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

........
r46237 | kpfleming | 2006-10-25 12:08:58 -0500 (Wed, 25 Oct 2006) | 2 lines

add support for prebuilt G.722 prompts and music on hold files

........


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

diff --git a/sounds/Makefile b/sounds/Makefile
index 661435524b..aff96967d6 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -29,6 +29,7 @@ MCS:=$(subst -ULAW,-ulaw,$(MCS))
 MCS:=$(subst -ALAW,-alaw,$(MCS))
 MCS:=$(subst -GSM,-gsm,$(MCS))
 MCS:=$(subst -G729,-g729,$(MCS))
+MCS:=$(subst -G722,-g722,$(MCS))
 CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
 CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
 MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
@@ -39,6 +40,7 @@ MES:=$(subst -ULAW,-ulaw,$(MES))
 MES:=$(subst -ALAW,-alaw,$(MES))
 MES:=$(subst -GSM,-gsm,$(MES))
 MES:=$(subst -G729,-g729,$(MES))
+MES:=$(subst -G722,-g722,$(MES))
 EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
 EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
 MM:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
@@ -47,6 +49,7 @@ MM:=$(subst -ULAW,-ulaw,$(MM))
 MM:=$(subst -ALAW,-alaw,$(MM))
 MM:=$(subst -GSM,-gsm,$(MM))
 MM:=$(subst -G729,-g729,$(MM))
+MM:=$(subst -G722,-g722,$(MM))
 MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz)
 MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 WGET_ARGS:=--continue
diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 860207d337..4ba16e092d 100644
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -10,6 +10,8 @@
 		</member>
 		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
 		</member>
+		<member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
+		</member>
 		<member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
 		</member>
 		<member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
@@ -20,6 +22,8 @@
 		</member>
 		<member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format">
 		</member>
+		<member name="CORE-SOUNDS-ES-G722" displayname="Spanish, G.722 format">
+		</member>
 		<member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
 		</member>
 		<member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
@@ -30,6 +34,8 @@
 		</member>
 		<member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
 		</member>
+		<member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format">
+		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
 		<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
@@ -43,6 +49,8 @@
 		</member>
 		<member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 format" >
 		</member>
+		<member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" >
+		</member>
 	</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
 		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
@@ -55,4 +63,6 @@
 		</member>
 		<member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
 		</member>
+		<member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
+		</member>
 	</category>