diff --git a/CREDITS b/CREDITS index a516382146..9b7713af4a 100644 --- a/CREDITS +++ b/CREDITS @@ -161,7 +161,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.txt b/UPGRADE.txt index 5fd59fbf1c..7455c3ed27 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -64,11 +64,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 b99c4c8f00..8aee8fa6e5 100755 --- a/build_tools/prep_tarball +++ b/build_tools/prep_tarball @@ -5,5 +5,5 @@ # # 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 diff --git a/doc/00README.1st b/doc/00README.1st index ef4b326a75..baddeabd13 100644 --- a/doc/00README.1st +++ b/doc/00README.1st @@ -35,7 +35,7 @@ ices.txt Integrating ICEcast streaming in Asterisk jitterbuffer.txt About the IAX2 jitterbuffer implementation math.txt About the math() application mp3.txt About MP3 support in Asterisk -musiconhold-fpm.txt Free Music On Hold music +musiconhold-opsound.txt Free Music On Hold music mysql.txt About MYSQL support in Asterisk odbcstorage.txt Voicemail storage of messages in UnixODBC privacy.txt Privacy enhancements in Asterisk diff --git a/doc/musiconhold-fpm.txt b/doc/musiconhold-fpm.txt deleted file mode 100644 index ad11c4815d..0000000000 --- a/doc/musiconhold-fpm.txt +++ /dev/null @@ -1,8 +0,0 @@ -About Hold Music -================ -Digium has licensed the music included with -the Asterisk distribution From FreePlayMusic -for use and distribution with Asterisk. It -is licensed ONLY for use as hold music within -an Asterisk based PBX. - diff --git a/doc/musiconhold-opsound.txt b/doc/musiconhold-opsound.txt new file mode 100644 index 0000000000..08c79f919a --- /dev/null +++ b/doc/musiconhold-opsound.txt @@ -0,0 +1,7 @@ +About Hold Music +================ +These files were obtained from http://opsound.org, where the authors placed them +under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which +may be found at http://creativecommons.org. + + diff --git a/sounds/Makefile b/sounds/Makefile index 14c187a33d..4cd6051082 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 fce1ae0c2c..fe7bebd3e1 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -38,18 +38,18 @@ - + yes - + - + - + - + - +