diff --git a/CREDITS b/CREDITS index 11552bdecad71bdaf27a2de5e74b614ffa7fec04..e9664b72e7fa0c623fb5c03832d0ffd6288b8308 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 992c62ca51539c39aaebc5cb41c95295f2cc082e..63107ed74a3986685302f69aac4b6bc0956f2b8a 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 ad11c4815d3c8109fcf14cca98d5d9dd88e1c412..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..99a59f88ba6217d09d912acda3bb68b30c175b5f --- /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 8d93b2900f07b6a80f221a9c3c73afa1b271296b..0000000000000000000000000000000000000000 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 106953307c869d327a4ab6127757cbc5b5e6eae0..0000000000000000000000000000000000000000 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 7d1e76d9f877e94faa2c0351603c9578d98f6680..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..63e3aa6d554432e87b326e4c255ae081327a42f9 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 0000000000000000000000000000000000000000..b90139e99f95fc0e0b2c38d3a173213c5f464fe3 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 0000000000000000000000000000000000000000..850e49119477496835cc902858a47a21ac9cb476 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 0000000000000000000000000000000000000000..a9d1c0f5a358824ad260a79a32e6cb9acb9d2fc9 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 0000000000000000000000000000000000000000..748c4c5089b23d9fffae93678694e631bb40dc60 Binary files /dev/null and b/sounds/reno_project-system.mp3 differ