diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 20:55:15 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 20:55:15 +0000 |
| commit | 8305b9b8420436117d0456dfcb9cca40739cf25d (patch) | |
| tree | d891873c71942b01255cdbb31d78dbffd2bda63e /include/asterisk/monitor.h | |
| parent | a1a3caa05ad2210a7eaf6028d2db5e34231b9fe7 (diff) | |
Merged revisions 195370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r195370 | tilghman | 2009-05-18 15:52:33 -0500 (Mon, 18 May 2009) | 15 lines
Recorded merge of revisions 195366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r195366 | tilghman | 2009-05-18 15:24:13 -0500 (Mon, 18 May 2009) | 8 lines
Add a similar dependency on SMDI for voicemail as already exists for ADSI.
(closes issue #14846)
Reported by: pj
Patches:
20090413__bug14846__1.4.diff.txt uploaded by tilghman (license 14)
20090507__issue14846__1.6.0.diff.txt uploaded by tilghman (license 14)
20090507__issue14846__1.6.1.diff.txt uploaded by tilghman (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@195373 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/monitor.h')
| -rw-r--r-- | include/asterisk/monitor.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/include/asterisk/monitor.h b/include/asterisk/monitor.h index 7f32b6994..4014939bb 100644 --- a/include/asterisk/monitor.h +++ b/include/asterisk/monitor.h @@ -24,6 +24,7 @@ #define _ASTERISK_MONITOR_H #include "asterisk/channel.h" +#include "asterisk/optional_api.h" enum AST_MONITORING_STATE { AST_MONITOR_RUNNING, @@ -50,22 +51,27 @@ struct ast_channel_monitor { }; /* Start monitoring a channel */ -int ast_monitor_start(struct ast_channel *chan, const char *format_spec, - const char *fname_base, int need_lock, int stream_action); +AST_OPTIONAL_API(int, ast_monitor_start, (struct ast_channel *chan, const char + *format_spec, const char *fname_base, int need_lock, int stream_action), + { return -1; }); /* Stop monitoring a channel */ -int ast_monitor_stop(struct ast_channel *chan, int need_lock); +AST_OPTIONAL_API(int, ast_monitor_stop, (struct ast_channel *chan, int + need_lock), { return -1; }); /* Change monitoring filename of a channel */ -int ast_monitor_change_fname(struct ast_channel *chan, - const char *fname_base, int need_lock); +AST_OPTIONAL_API(int, ast_monitor_change_fname, (struct ast_channel *chan, + const char *fname_base, int need_lock), { return -1; }); -void ast_monitor_setjoinfiles(struct ast_channel *chan, int turnon); +AST_OPTIONAL_API(void, ast_monitor_setjoinfiles, (struct ast_channel *chan, + int turnon), { return; }); /* Pause monitoring of a channel */ -int ast_monitor_pause(struct ast_channel *chan); +AST_OPTIONAL_API(int, ast_monitor_pause, (struct ast_channel *chan), + { return -1; }); /* Unpause monitoring of a channel */ -int ast_monitor_unpause(struct ast_channel *chan); +AST_OPTIONAL_API(int, ast_monitor_unpause, (struct ast_channel *chan), + { return -1; }); #endif /* _ASTERISK_MONITOR_H */ |