[asterisk-commits] file: branch 11 r373991 - in /branches/11: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Sep 28 07:16:40 2012
New Revision: 373991

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373991
Log:
Update documentation to make it explicit that "stream file" will not restart musiconhold.

(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

Modified:
    branches/11/   (props changed)
    branches/11/res/res_agi.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_agi.c?view=diff&rev=373991&r1=373990&r2=373991
==============================================================================
--- branches/11/res/res_agi.c (original)
+++ branches/11/res/res_agi.c Fri Sep 28 07:16:40 2012
@@ -599,7 +599,7 @@
 		<description>
 			<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
-			used.</para>
+			used. This generator will be stopped automatically when playing a file.</para>
 			<para>Always returns <literal>0</literal>.</para>
 		</description>
 	</agi>
@@ -649,7 +649,9 @@
 			<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
 			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>
 		<see-also>
 			<ref type="agi">control stream file</ref>