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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@212928 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CREDITS b/CREDITS
index 004ba633475f61b34b272177d248538adfdd88b4..6114949989160d2ff89d3cf5a61bcbc3a07c64f1 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -201,7 +201,7 @@ Brian M. Clapper - poll.c emulation
        This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 Asterisk uses libedit, the lightweight readline replacement from NetBSD.

diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f826946e06e5f0bbdd3271da0d33be6b013526b..f99f937b0f5461fa11c398e34d06bfe25af4f5a8 100644 (file)
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -74,11 +74,11 @@ Beginning with Asterisk 1.4, the sound files and music on hold files supplied fo
 use with Asterisk have been replaced with new versions produced from high quality
 master recordings, and are available in three languages (English, French and
 Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
-In addition, the music on hold files provided by FreePlay Music are now available
+In addition, the music on hold files provided by opsound.org Music are now available
 in the same five formats, but no longer available in MP3 format.
 
 The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
-(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
+(as were supplied with previous releases) and the opsound.org MOH files in WAV format.
 All of the other variations can be installed by running 'make menuselect' and
 selecting the packages you wish to install; when you run 'make install', those
 packages will be downloaded and installed along with the standard files included

diff --git a/build_tools/prep_tarball b/build_tools/prep_tarball
index 49c36f447385e1d85b198522ef1ee2f15cbe2b64..dc762b1729d9eb31651549be9e062d2ab3410d5c 100755 (executable)
--- a/build_tools/prep_tarball
+++ b/build_tools/prep_tarball
@@ -5,7 +5,7 @@
 #
 # It will be executed from the top-level directory of the project.
 
-make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget all
+make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV WGET=wget DOWNLOAD=wget all
 make AWK=awk GREP=grep menuselect-tree
 
 make_tex_docs() {

diff --git a/doc/tex/asterisk.tex b/doc/tex/asterisk.tex
index 7bb217265f1d6b39393221c75be64123e9d3aef1..2fe63cde4f4de5b2173887d3204656ae25baba5d 100644 (file)
--- a/doc/tex/asterisk.tex
+++ b/doc/tex/asterisk.tex
@@ -48,7 +48,7 @@ reference purposes.
   \input{../../LICENSE}
      \subsection{Hold Music}
        Digium has licensed the music included with
-       the Asterisk distribution From FreePlayMusic
+       the Asterisk distribution From opsound.org
        for use and distribution with Asterisk.  It
        is licensed ONLY for use as hold music within
        an Asterisk based PBX.

diff --git a/sounds/Makefile b/sounds/Makefile
index 4cb112da3cee1a27802f42dc636b1969f68e9a07..2d99663c09c34bfaac23e019be1adf2342cf550b 100644 (file)
--- 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 46987f28329ff2896563dbbae424edc029a39f50..5cf0c6c783b5a20110877a5b5208ab162f3d2649 100644 (file)
--- 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">