diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:31:40 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:31:40 +0000 |
| commit | 36e090ea94a55fe7b536a71193349ed69ce0fcfc (patch) | |
| tree | 255656a4f78804ebf5d7c055d0ac0be667a9d110 /sounds | |
| parent | 4642ba08e33ec2392e8b8272f8e58aabd14439fd (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.2@212931 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 2 | ||||
| -rw-r--r-- | sounds/sounds.xml | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index c9687c53d..a8a6d24d1 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -48,7 +48,7 @@ MES:=$(subst -SIREN7,-siren7,$(MES)) MES:=$(subst -SIREN14,-siren14,$(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 c25014004..192edab39 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -56,24 +56,24 @@ </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> - <member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" > + <member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" > </member> - <member name="MOH-FREEPLAY-SIREN7" displayname="FreePlay Music On Hold Files, G.722.1 (Siren7) format" > + <member name="MOH-OPSOUND-SIREN7" displayname="opsound.org Music On Hold Files, G.722.1 (Siren7) format" > </member> - <member name="MOH-FREEPLAY-SIREN14" displayname="FreePlay Music On Hold Files, G.722.1C (Siren14) format" > + <member name="MOH-OPSOUND-SIREN14" displayname="opsound.org Music On Hold Files, G.722.1C (Siren14) format" > </member> </category> <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes"> |