From 1eedddf8109a2d240b87a1ba159853337159eb00 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 18 Aug 2009 20:30:39 +0000 Subject: [PATCH] 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.0@212926 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- CREDITS | 2 +- UPGRADE-1.4.txt | 4 ++-- build_tools/prep_tarball | 2 +- doc/tex/asterisk.tex | 2 +- sounds/Makefile | 2 +- sounds/sounds.xml | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CREDITS b/CREDITS index 2b8ae738e8..882ac4b3ae 100644 --- a/CREDITS +++ b/CREDITS @@ -198,7 +198,7 @@ Brian M. Clapper - poll.c emulation This product includes software developed by Brian M. Clapper === 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 4f826946e0..f99f937b0f 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 49c36f4473..dc762b1729 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 7bb217265f..2fe63cde4f 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 ac58c6b8ee..b9c306c445 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 d80765d938..675bb9ab60 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -44,18 +44,18 @@ - + yes - + - + - + - + - + -- 2.47.2