[svn-commits] kpfleming: trunk r46238 - in /trunk: ./ sounds/Makefile sounds/sounds.xml

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Oct 25 12:12:59 2006
New Revision: 46238

URL: http://svn.digium.com/view/asterisk?rev=46238&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/sounds/Makefile
    trunk/sounds/sounds.xml

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/sounds/Makefile?rev=46238&r1=46237&r2=46238&view=diff
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Wed Oct 25 12:12:59 2006
@@ -29,6 +29,7 @@
 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 -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 -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

Modified: trunk/sounds/sounds.xml
URL: http://svn.digium.com/view/asterisk/trunk/sounds/sounds.xml?rev=46238&r1=46237&r2=46238&view=diff
==============================================================================
--- trunk/sounds/sounds.xml (original)
+++ trunk/sounds/sounds.xml Wed Oct 25 12:12:59 2006
@@ -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">
@@ -29,6 +33,8 @@
 		<member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format">
 		</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">
@@ -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>