diff options
author | Jonathan Rose <jrose@digium.com> | 2011-09-19 20:23:29 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2011-09-19 20:23:29 +0000 |
commit | 364eb5683575df3a72302f5494a36fd55690e1c9 (patch) | |
tree | f5e0811e47a6bf9722a4af485fb929867063ba03 /apps/app_mp3.c | |
parent | 5c71a502a7c318d7efd33d8cb2f348fb710940e3 (diff) |
Merged revisions 336717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336717 | jrose | 2011-09-19 15:16:23 -0500 (Mon, 19 Sep 2011) | 14 lines
Merged revisions 336716 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336716 | jrose | 2011-09-19 15:07:36 -0500 (Mon, 19 Sep 2011) | 7 lines
Document applications that play audio and do not answer unanswered calls.
This patch is part of an effort to document early media and its usage. If you are
interested in contributing to this documentation effort, there are probably other
applications worth documenting as well as an Asterisk wiki article at
https://wiki.asterisk.org/wiki/display/AST/Early+Media+and+the+Progress+Application
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_mp3.c')
-rw-r--r-- | apps/app_mp3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 922d42a5b..4c99be72d 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -65,9 +65,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <description> <para>Executes mpg123 to play the given location, which typically would be a mp3 filename or m3u playlist filename or a URL. Please read http://en.wikipedia.org/wiki/M3U - to see how M3U playlist file format is like, Example usage would be + to see how M3U playlist file format is like, Example usage would be exten => 1234,1,MP3Player(/var/lib/asterisk/playlist.m3u) User can exit by pressing any key on the dialpad, or by hanging up.</para> + <para>This application does not automatically answer and should be preceeded by an + application such as Answer() or Progress().</para> </description> </application> |