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: http://svn.digium.com/svn/asterisk/trunk@212922 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
e925212260
commit
a9fb92854f
2
CREDITS
2
CREDITS
|
@ -213,7 +213,7 @@ Brian M. Clapper - poll.c emulation
|
||||||
This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
|
This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
|
||||||
|
|
||||||
=== HOLD MUSIC ===
|
=== HOLD MUSIC ===
|
||||||
Music provided by www.freeplaymusic.com
|
Music provided by www.opsound.org
|
||||||
|
|
||||||
=== OTHER SOURCE CODE IN ASTERISK ===
|
=== OTHER SOURCE CODE IN ASTERISK ===
|
||||||
Asterisk uses libedit, the lightweight readline replacement from NetBSD.
|
Asterisk uses libedit, the lightweight readline replacement from NetBSD.
|
||||||
|
|
|
@ -74,11 +74,11 @@ Beginning with Asterisk 1.4, the sound files and music on hold files supplied fo
|
||||||
use with Asterisk have been replaced with new versions produced from high quality
|
use with Asterisk have been replaced with new versions produced from high quality
|
||||||
master recordings, and are available in three languages (English, French and
|
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).
|
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.
|
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,
|
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
|
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
|
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
|
packages will be downloaded and installed along with the standard files included
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#
|
#
|
||||||
# It will be executed from the top-level directory of the project.
|
# 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
|
make AWK=awk GREP=grep menuselect-tree
|
||||||
|
|
||||||
make_tex_docs() {
|
make_tex_docs() {
|
||||||
|
|
|
@ -48,7 +48,7 @@ reference purposes.
|
||||||
\input{../../LICENSE}
|
\input{../../LICENSE}
|
||||||
\subsection{Hold Music}
|
\subsection{Hold Music}
|
||||||
Digium has licensed the music included with
|
Digium has licensed the music included with
|
||||||
the Asterisk distribution From FreePlayMusic
|
the Asterisk distribution From opsound.org
|
||||||
for use and distribution with Asterisk. It
|
for use and distribution with Asterisk. It
|
||||||
is licensed ONLY for use as hold music within
|
is licensed ONLY for use as hold music within
|
||||||
an Asterisk based PBX.
|
an Asterisk based PBX.
|
||||||
|
|
|
@ -48,7 +48,7 @@ MES:=$(subst -SIREN7,-siren7,$(MES))
|
||||||
MES:=$(subst -SIREN14,-siren14,$(MES))
|
MES:=$(subst -SIREN14,-siren14,$(MES))
|
||||||
EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
|
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))
|
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 -WAV,-wav,$(MM))
|
||||||
MM:=$(subst -ULAW,-ulaw,$(MM))
|
MM:=$(subst -ULAW,-ulaw,$(MM))
|
||||||
MM:=$(subst -ALAW,-alaw,$(MM))
|
MM:=$(subst -ALAW,-alaw,$(MM))
|
||||||
|
|
|
@ -56,24 +56,24 @@
|
||||||
</member>
|
</member>
|
||||||
</category>
|
</category>
|
||||||
<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
|
<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>
|
<defaultenabled>yes</defaultenabled>
|
||||||
</member>
|
</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>
|
||||||
<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>
|
||||||
<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>
|
||||||
<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>
|
||||||
<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>
|
</member>
|
||||||
<member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" >
|
<member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
|
||||||
</member>
|
</member>
|
||||||
<member name="MOH-FREEPLAY-SIREN7" displayname="FreePlay Music On Hold Files, G.722.1 (Siren7) format" >
|
<member name="MOH-OPSOUND-SIREN7" displayname="opsound.org Music On Hold Files, G.722.1 (Siren7) format" >
|
||||||
</member>
|
</member>
|
||||||
<member name="MOH-FREEPLAY-SIREN14" displayname="FreePlay Music On Hold Files, G.722.1C (Siren14) format" >
|
<member name="MOH-OPSOUND-SIREN14" displayname="opsound.org Music On Hold Files, G.722.1C (Siren14) format" >
|
||||||
</member>
|
</member>
|
||||||
</category>
|
</category>
|
||||||
<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
|
<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
|
||||||
|
|
Reference in New Issue