summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-07-09 04:09:16 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-07-09 04:09:16 +0000
commitba857cc8a9984225a842137c0674df6089862bb0 (patch)
tree66821907c5cc5281f80b3abd71f4c6e01c92cc78 /include/asterisk
parent56503686c9de910d0ba84f00e2badd94cb107628 (diff)
Merged revisions 73985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r73985 | tilghman | 2007-07-08 23:03:20 -0500 (Sun, 08 Jul 2007) | 2 lines Doxygen formatting fixes; fixes errors while 'make progdocs'. (Closes issue #10104) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/app.h11
-rw-r--r--include/asterisk/channel.h12
2 files changed, 13 insertions, 10 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index fc763d5f0..76683d5eb 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -165,10 +165,13 @@ int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, in
/*!
* \brief Stream a file with fast forward, pause, reverse, restart.
- * \param offsetms Before calling this function, set this to be the number
- * of ms to start from the beginning of the file. When the function
- * returns, it will be the number of ms from the beginning where the
- * playback stopped. Pass NULL if you don't care.
+ * \param chan
+ * \param file filename
+ * \param fwd, rev, stop, pause, restart, skipms, offsetms
+ * Before calling this function, set this to be the number
+ * of ms to start from the beginning of the file. When the function
+ * returns, it will be the number of ms from the beginning where the
+ * playback stopped. Pass NULL if you don't care.
*/
int ast_control_streamfile(struct ast_channel *chan, const char *file, const char *fwd, const char *rev, const char *stop, const char *pause, const char *restart, int skipms, long *offsetms);
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 1cbf67410..8c0b6a51a 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -107,12 +107,12 @@
so a transcoding module is needed.
References:
- - ast_channel_early_bridge()
- - ast_channel_bridge()
- - app_meetme.c
- - \ref AstRTPbridge
- - ast_rtp_bridge()
- - \ref Def_Channel
+ \li \see ast_channel_early_bridge()
+ \li \see ast_channel_bridge()
+ \li \see app_meetme.c
+ \li \ref AstRTPbridge
+ \li \see ast_rtp_bridge()
+ \li \ref Def_Channel
*/
/*! \page AstFileDesc File descriptors