Convert this branch to Opsound music-on-hold.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@212960 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CREDITS b/CREDITS
index 452b2fa0528e0b204432803a4fba198b0724ccde..5be0a1af4d883f33c0da1ee637dd6594c65e2922 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -95,7 +95,7 @@ Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
        available under a Creative Commons License at http://www.asteriskdocs.org
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 

diff --git a/README.fpm b/README.fpm
deleted file mode 100644 (file)
index ad11c48..0000000
--- a/README.fpm
+++ /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/README.opsound b/README.opsound
new file mode 100644 (file)
index 0000000..99a59f8
--- /dev/null
+++ b/README.opsound
@@ -0,0 +1,22 @@
+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.
+
+Credits
+================
+macroform-cold_day - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-robot_dity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-the_simplicity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+manolo_camp-morning_coffee - Manolo Camp
+beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
+
+reno_project-system - Reno Project
+renoproject@hotmail.com - http://www.jamendo.com/en/album/23661

diff --git a/sounds/moh/LICENSE b/sounds/moh/LICENSE
index adefcc4ad349e44ab58a16b78565e47d4fca7af3..08c79f919abf7648120a478cde06418db7028b23 100644 (file)
--- a/sounds/moh/LICENSE
+++ b/sounds/moh/LICENSE
@@ -1,3 +1,7 @@
-Music Provided By www.freeplaymusic.com. These sound files are provided by
-Digium under license from Freeplay Music Corporation for use in conjunction
-with the Asterisk software only.
+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/moh/fpm-calm-river.mp3 b/sounds/moh/fpm-calm-river.mp3
deleted file mode 100644 (file)
index 8d93b29..0000000
Binary files a/sounds/moh/fpm-calm-river.mp3 and /dev/null differ

diff --git a/sounds/moh/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3
deleted file mode 100644 (file)
index 1069533..0000000
Binary files a/sounds/moh/fpm-sunshine.mp3 and /dev/null differ

diff --git a/sounds/moh/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3
deleted file mode 100644 (file)
index 7d1e76d..0000000
Binary files a/sounds/moh/fpm-world-mix.mp3 and /dev/null differ

diff --git a/sounds/moh/macroform-cold_day.mp3 b/sounds/moh/macroform-cold_day.mp3
new file mode 100644 (file)
index 0000000..63e3aa6
Binary files /dev/null and b/sounds/moh/macroform-cold_day.mp3 differ

diff --git a/sounds/moh/macroform-robot_dity.mp3 b/sounds/moh/macroform-robot_dity.mp3
new file mode 100644 (file)
index 0000000..b90139e
Binary files /dev/null and b/sounds/moh/macroform-robot_dity.mp3 differ

diff --git a/sounds/moh/macroform-the_simplicity.mp3 b/sounds/moh/macroform-the_simplicity.mp3
new file mode 100644 (file)
index 0000000..850e491
Binary files /dev/null and b/sounds/moh/macroform-the_simplicity.mp3 differ

diff --git a/sounds/moh/manolo_camp-morning_coffee.mp3 b/sounds/moh/manolo_camp-morning_coffee.mp3
new file mode 100644 (file)
index 0000000..a9d1c0f
Binary files /dev/null and b/sounds/moh/manolo_camp-morning_coffee.mp3 differ

diff --git a/sounds/moh/reno_project-system.mp3 b/sounds/moh/reno_project-system.mp3
new file mode 100644 (file)
index 0000000..748c4c5
Binary files /dev/null and b/sounds/moh/reno_project-system.mp3 differ