From: Automerge script Date: Fri, 28 Sep 2012 12:27:46 +0000 (+0000) Subject: Merged revisions 373990 via svnmerge from X-Git-Tag: 10.10.0-digiumphones-rc1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10036bbbe4cd5ecab2df852e642bd2b3a612a717;p=thirdparty%2Fasterisk.git Merged revisions 373990 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r373990 | file | 2012-09-28 07:15:48 -0500 (Fri, 28 Sep 2012) | 8 lines 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 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@374018 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_agi.c b/res/res_agi.c index edc4896251..bec8f01a20 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -598,7 +598,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") Enables/Disables the music on hold generator. If class is not specified, then the default music on hold class will be - used. + used. This generator will be stopped automatically when playing a file. Always returns 0. @@ -648,7 +648,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") Send the given file, allowing playback to be interrupted by the given digits, if any. Returns 0 if playback completes without a digit being pressed, or the ASCII numerical value of the digit if one was pressed, - or -1 on error or if the channel was disconnected. + or -1 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. control stream file