kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 22:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update documentation to make it explicit that "stream file" will not restart musiconhold.

Browse Source 
(issue ASTERISK-17367)
Reported by: oej
........

Merged revisions 373989 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373990 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373991 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@373992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2012-09-28 12:17:41 +00:00
parent acb3a5f76f
commit b6a00a1d97
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_agi.c
View File

@@ -599,7 +599,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<description> <description>
<para>Enables/Disables the music on hold generator. If <replaceable>class</replaceable> <para>Enables/Disables the music on hold generator. If <replaceable>class</replaceable>
is not specified, then the <literal>default</literal> music on hold class will be is not specified, then the <literal>default</literal> music on hold class will be
used.</para> used. This generator will be stopped automatically when playing a file.</para>
<para>Always returns <literal>0</literal>.</para> <para>Always returns <literal>0</literal>.</para>
</description> </description>
</agi> </agi>
@@ -649,7 +649,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Send the given file, allowing playback to be interrupted by the given <para>Send the given file, allowing playback to be interrupted by the given
digits, if any. Returns <literal>0</literal> if playback completes without a digit digits, if any. Returns <literal>0</literal> if playback completes without a digit
being pressed, or the ASCII numerical value of the digit if one was pressed, being pressed, or the ASCII numerical value of the digit if one was pressed,
or <literal>-1</literal> on error or if the channel was disconnected.</para> or <literal>-1</literal> on error or if the channel was disconnected. If
musiconhold is playing before calling stream file it will be automatically
stopped and will not be restarted after completion.</para>
</description> </description>
<see-also> <see-also>
<ref type="agi">control stream file</ref> <ref type="agi">control stream file</ref>