diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:30:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:30:39 +0000 |
commit | 832fcfa328e478aa282e5bc70f2b8ba099aefb23 (patch) | |
tree | dd604b9a28cead5490a5bb8a98f53625e93f37fa /sounds | |
parent | 9ac4ce0ab4c6a5a1c9f9550571c4eaadc2c9e78f (diff) |
Merged revisions 212922 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r212922 | kpfleming | 2009-08-18 15:29:37 -0500 (Tue, 18 Aug 2009) | 6 lines
Convert this branch to Opsound music-on-hold.
For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@212926 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
-rw-r--r-- | sounds/Makefile | 2 | ||||
-rw-r--r-- | sounds/sounds.xml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index ac58c6b8e..b9c306c44 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -43,7 +43,7 @@ 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)) +MM:=$(subst -OPSOUND-,-opsound-,$(MENUSELECT_MOH)) MM:=$(subst -WAV,-wav,$(MM)) MM:=$(subst -ULAW,-ulaw,$(MM)) MM:=$(subst -ALAW,-alaw,$(MM)) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index d80765d93..675bb9ab6 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -44,18 +44,18 @@ </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" > + <member name="MOH-OPSOUND-WAV" displayname="opsound.org 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 name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" > </member> - <member name="MOH-FREEPLAY-ALAW" displayname="FreePlay Music On Hold Files, a-Law format" > + <member name="MOH-OPSOUND-ALAW" displayname="opsound.org Music On Hold Files, a-Law format" > </member> - <member name="MOH-FREEPLAY-GSM" displayname="FreePlay Music On Hold Files, GSM format" > + <member name="MOH-OPSOUND-GSM" displayname="opsound.org Music On Hold Files, GSM format" > </member> - <member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 format" > + <member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" > </member> - <member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" > + <member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" > </member> </category> <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes"> |