From bf9acebd189d8ee3778450072d0db2719b37601d Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 18 Aug 2009 20:31:18 +0000
Subject: 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.1@212928 f38db490-d61c-443f-a65b-d21fe96a405b
---
 sounds/Makefile   |  2 +-
 sounds/sounds.xml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sounds')

diff --git a/sounds/Makefile b/sounds/Makefile
index 4cb112da3..2d99663c0 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -44,7 +44,7 @@ MES:=$(subst -G722,-g722,$(MES))
 MES:=$(subst -SLN16,-sln16,$(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 46987f283..5cf0c6c78 100644
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -44,20 +44,20 @@
 		</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>
 	</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
-- 
cgit v1.2.3