diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 22:37:31 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 22:37:31 +0000 |
| commit | c3a90e6c79d94a70cc0c5437860a9b6ba4e5c337 (patch) | |
| tree | b7c9a74b58106459f6aa50ac1833ccb49a8fcb0a /sounds | |
| parent | 5e4ebd786deb5e2d496e4c3cf0469e34c8d45808 (diff) | |
moh files will now be distributed in native format, not mp3, so...
update sounds/Makefile to download/unpack the proper files
remove all evidence of mpg123 from the main Makefile
change the sample musiconhold.conf file to use native mode instead of mp3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32917 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 8 | ||||
| -rw-r--r-- | sounds/sounds.xml | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index 6c28e34e0..44ea10bdc 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -15,7 +15,7 @@ include ../menuselect.makeopts PWD:=$(shell pwd) SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds -MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/mohmp3 +MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh CORE_SOUNDS_VERSION:=1.4.0 SOUNDS_URL:=http://cork.digium.internal/apache2-default MENUSELECT_CORE_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) @@ -38,7 +38,11 @@ MENUSELECT_EXTRA_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_EXTRA_SOUNDS)) MENUSELECT_EXTRA_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_EXTRA_SOUNDS)) EXTRA_SOUNDS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=asterisk-extra-sounds-%.tar.gz) MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH)) -MENUSELECT_MOH:=$(subst -MP3,-mp3,$(MENUSELECT_MOH)) +MENUSELECT_MOH:=$(subst -WAV,-wav,$(MENUSELECT_MOH)) +MENUSELECT_MOH:=$(subst -ULAW,-ulaw,$(MENUSELECT_MOH)) +MENUSELECT_MOH:=$(subst -ALAW,-alaw,$(MENUSELECT_MOH)) +MENUSELECT_MOH:=$(subst -GSM,-gsm,$(MENUSELECT_MOH)) +MENUSELECT_MOH:=$(subst -G729,-g729,$(MENUSELECT_MOH)) MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz) MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index 59c74a3cb..860207d33 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -31,10 +31,18 @@ <member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format"> </member> </category> - <category name="MENUSELECT_MOH" displayname="Music On Hold File Package" positive_output="yes"> - <member name="MOH-FREEPLAY-MP3" displayname="FreePlay Music On Hold Files, MP3 format" > + <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" > <defaultenabled>yes</defaultenabled> </member> + <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" > + </member> + <member name="MOH-FREEPLAY-ALAW" displayname="FreePlay Music On Hold Files, a-Law format" > + </member> + <member name="MOH-FREEPLAY-GSM" displayname="FreePlay Music On Hold Files, GSM format" > + </member> + <member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 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"> |