diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-09-28 12:17:41 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-09-28 12:17:41 +0000 |
| commit | b6a00a1d976f30251332c2ae0ec95514d794968f (patch) | |
| tree | bf304a69fc2eaa7456b3bb780ea99b4eb38126aa /res | |
| parent | acb3a5f76fd5ceb8a9f9beef066759ff70194eb2 (diff) | |
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
........
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
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 213805ed3..d5393fc68 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -599,7 +599,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <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 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <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> |