From: Kevin P. Fleming Date: Tue, 18 Aug 2009 20:22:48 +0000 (+0000) Subject: Convert this branch to Opsound music-on-hold. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c262931d754b4537ded39ff8354293500e45af;p=thirdparty%2Fasterisk.git 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.0@212901 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/CREDITS b/CREDITS index 11552bdeca..e9664b72e7 100644 --- a/CREDITS +++ b/CREDITS @@ -65,7 +65,7 @@ Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin. John Todd - Monkey sounds and associated teletorture prompt === HOLD MUSIC === -Music provided by www.freeplaymusic.com +Music provided by www.opsound.org === OTHER SOURCE CODE IN ASTERISK === diff --git a/ChangeLog b/ChangeLog index 992c62ca51..63107ed74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -277,7 +277,7 @@ Asterisk 1.0-RC2 -- Additional CDR backends -- Allow muted to reconnect -- Call parking improvements (including SIP parking support) - -- Added licensed hold music from FreePlayMusic + -- Added licensed hold music from opsound.org -- GR-303 and Zap improvements -- More bug fixes from the bug tracker -- Improved FreeBSD/OpenBSD/MacOS X support diff --git a/README.fpm b/README.fpm deleted file mode 100644 index ad11c4815d..0000000000 --- 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 0000000000..99a59f88ba --- /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/fpm-calm-river.mp3 b/sounds/fpm-calm-river.mp3 deleted file mode 100644 index 8d93b2900f..0000000000 Binary files a/sounds/fpm-calm-river.mp3 and /dev/null differ diff --git a/sounds/fpm-sunshine.mp3 b/sounds/fpm-sunshine.mp3 deleted file mode 100644 index 106953307c..0000000000 Binary files a/sounds/fpm-sunshine.mp3 and /dev/null differ diff --git a/sounds/fpm-world-mix.mp3 b/sounds/fpm-world-mix.mp3 deleted file mode 100644 index 7d1e76d9f8..0000000000 Binary files a/sounds/fpm-world-mix.mp3 and /dev/null differ diff --git a/sounds/macroform-cold_day.mp3 b/sounds/macroform-cold_day.mp3 new file mode 100644 index 0000000000..63e3aa6d55 Binary files /dev/null and b/sounds/macroform-cold_day.mp3 differ diff --git a/sounds/macroform-robot_dity.mp3 b/sounds/macroform-robot_dity.mp3 new file mode 100644 index 0000000000..b90139e99f Binary files /dev/null and b/sounds/macroform-robot_dity.mp3 differ diff --git a/sounds/macroform-the_simplicity.mp3 b/sounds/macroform-the_simplicity.mp3 new file mode 100644 index 0000000000..850e491194 Binary files /dev/null and b/sounds/macroform-the_simplicity.mp3 differ diff --git a/sounds/manolo_camp-morning_coffee.mp3 b/sounds/manolo_camp-morning_coffee.mp3 new file mode 100644 index 0000000000..a9d1c0f5a3 Binary files /dev/null and b/sounds/manolo_camp-morning_coffee.mp3 differ diff --git a/sounds/reno_project-system.mp3 b/sounds/reno_project-system.mp3 new file mode 100644 index 0000000000..748c4c5089 Binary files /dev/null and b/sounds/reno_project-system.mp3 differ