aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
commitf6a8f415f3fff76dcdb3d41bf8965a076e13821b (patch)
tree23a22490b520ad4c5d8abe9a67a88e500f336d43
parente62be571e763e14645bfd5751bba60e52e89535b (diff)
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.7@212958 f38db490-d61c-443f-a65b-d21fe96a405bv1.6.0.7
-rw-r--r--CREDITS2
-rw-r--r--UPGRADE-1.4.txt4
-rwxr-xr-xbuild_tools/prep_tarball2
-rw-r--r--doc/tex/asterisk.tex2
-rw-r--r--sounds/Makefile2
-rw-r--r--sounds/sounds.xml12
6 files changed, 12 insertions, 12 deletions
diff --git a/CREDITS b/CREDITS
index 2b8ae738e..882ac4b3a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -198,7 +198,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 4f826946e..f99f937b0 100644
--- 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 49c36f447..dc762b172 100755
--- 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 7bb217265..2fe63cde4 100644
--- 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 f441b3972..fe7d92376 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 ffcf11f19..3cf2b5656 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">