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
commitc0ae136edfca40b7dcd40f281dc4757967cb86c0 (patch)
treea97054fc8c61721963acaf3448b4046ed300d4fa
parent9734fef73eee02c119e3ca00d45d6fe2f9d834ac (diff)
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.2.24@212958 f38db490-d61c-443f-a65b-d21fe96a405bv1.2.24
-rw-r--r--CREDITS2
-rw-r--r--README.fpm8
-rw-r--r--README.opsound22
-rw-r--r--sounds/moh/LICENSE10
-rw-r--r--sounds/moh/fpm-calm-river.mp3bin1939812 -> 0 bytes
-rw-r--r--sounds/moh/fpm-sunshine.mp3bin2582496 -> 0 bytes
-rw-r--r--sounds/moh/fpm-world-mix.mp3bin2217563 -> 0 bytes
-rw-r--r--sounds/moh/macroform-cold_day.mp3bin0 -> 5329576 bytes
-rw-r--r--sounds/moh/macroform-robot_dity.mp3bin0 -> 4067300 bytes
-rw-r--r--sounds/moh/macroform-the_simplicity.mp3bin0 -> 6687558 bytes
-rw-r--r--sounds/moh/manolo_camp-morning_coffee.mp3bin0 -> 2343059 bytes
-rw-r--r--sounds/moh/reno_project-system.mp3bin0 -> 7586772 bytes
12 files changed, 30 insertions, 12 deletions
diff --git a/CREDITS b/CREDITS
index 452b2fa05..5be0a1af4 100644
--- 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
index ad11c4815..000000000
--- 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
index 000000000..99a59f88b
--- /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 adefcc4ad..08c79f919 100644
--- 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
index 8d93b2900..000000000
--- a/sounds/moh/fpm-calm-river.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3
deleted file mode 100644
index 106953307..000000000
--- a/sounds/moh/fpm-sunshine.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3
deleted file mode 100644
index 7d1e76d9f..000000000
--- a/sounds/moh/fpm-world-mix.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/macroform-cold_day.mp3 b/sounds/moh/macroform-cold_day.mp3
new file mode 100644
index 000000000..63e3aa6d5
--- /dev/null
+++ b/sounds/moh/macroform-cold_day.mp3
Binary files differ
diff --git a/sounds/moh/macroform-robot_dity.mp3 b/sounds/moh/macroform-robot_dity.mp3
new file mode 100644
index 000000000..b90139e99
--- /dev/null
+++ b/sounds/moh/macroform-robot_dity.mp3
Binary files differ
diff --git a/sounds/moh/macroform-the_simplicity.mp3 b/sounds/moh/macroform-the_simplicity.mp3
new file mode 100644
index 000000000..850e49119
--- /dev/null
+++ b/sounds/moh/macroform-the_simplicity.mp3
Binary files differ
diff --git a/sounds/moh/manolo_camp-morning_coffee.mp3 b/sounds/moh/manolo_camp-morning_coffee.mp3
new file mode 100644
index 000000000..a9d1c0f5a
--- /dev/null
+++ b/sounds/moh/manolo_camp-morning_coffee.mp3
Binary files differ
diff --git a/sounds/moh/reno_project-system.mp3 b/sounds/moh/reno_project-system.mp3
new file mode 100644
index 000000000..748c4c508
--- /dev/null
+++ b/sounds/moh/reno_project-system.mp3
Binary files differ