[asterisk-commits] kpfleming: branch 1.4 r212913 - in /branches/1.4: ./ build_tools/ doc/ sounds/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Aug 18 15:26:56 CDT 2009 

Author: kpfleming
Date: Tue Aug 18 15:26:53 2009
New Revision: 212913

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=212913
Log:
Convert this branch to Opsound music-on-hold.

For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/


Added:
    branches/1.4/doc/musiconhold-opsound.txt
      - copied, made public unchanged from r212909, team/kpfleming/private/newmoh-1.4/doc/musiconhold-opsound.txt
Removed:
    branches/1.4/doc/musiconhold-fpm.txt
Modified:
    branches/1.4/   (props changed)
    branches/1.4/CREDITS
    branches/1.4/UPGRADE.txt
    branches/1.4/build_tools/prep_tarball
    branches/1.4/doc/00README.1st
    branches/1.4/sounds/Makefile
    branches/1.4/sounds/sounds.xml

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/CREDITS
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/CREDITS?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/CREDITS (original)
+++ branches/1.4/CREDITS Tue Aug 18 15:26:53 2009
@@ -161,7 +161,7 @@
 	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.

Modified: branches/1.4/UPGRADE.txt
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/UPGRADE.txt?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/UPGRADE.txt (original)
+++ branches/1.4/UPGRADE.txt Tue Aug 18 15:26:53 2009
@@ -64,11 +64,11 @@
 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

Modified: branches/1.4/build_tools/prep_tarball
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/build_tools/prep_tarball?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/build_tools/prep_tarball (original)
+++ branches/1.4/build_tools/prep_tarball Tue Aug 18 15:26:53 2009
@@ -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

Modified: branches/1.4/doc/00README.1st
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/doc/00README.1st?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/doc/00README.1st (original)
+++ branches/1.4/doc/00README.1st Tue Aug 18 15:26:53 2009
@@ -35,7 +35,7 @@
 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

Copied: branches/1.4/doc/musiconhold-opsound.txt (from r212909, team/kpfleming/private/newmoh-1.4/doc/musiconhold-opsound.txt)
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/doc/musiconhold-opsound.txt?view=diff&rev=212913&p1=team/kpfleming/private/newmoh-1.4/doc/musiconhold-opsound.txt&r1=212909&p2=branches/1.4/doc/musiconhold-opsound.txt&r2=212913
==============================================================================
--- team/kpfleming/private/newmoh-1.4/doc/musiconhold-opsound.txt (original)
+++ branches/1.4/doc/musiconhold-opsound.txt Tue Aug 18 15:26:53 2009
@@ -1,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.
+
+

Modified: branches/1.4/sounds/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/sounds/Makefile?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/sounds/Makefile (original)
+++ branches/1.4/sounds/Makefile Tue Aug 18 15:26:53 2009
@@ -43,7 +43,7 @@
 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))

Modified: branches/1.4/sounds/sounds.xml
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/sounds/sounds.xml?view=diff&rev=212913&r1=212912&r2=212913
==============================================================================
--- branches/1.4/sounds/sounds.xml (original)
+++ branches/1.4/sounds/sounds.xml Tue Aug 18 15:26:53 2009
@@ -38,18 +38,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">

More information about the asterisk-commits mailing list