diff options
author | Corey Farrell <git@cfware.com> | 2015-05-02 19:58:40 -0400 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-05-02 20:25:11 -0400 |
commit | ad6ea2969706c1d19290d2db32957830e73a75ae (patch) | |
tree | 97ddf21a82040c5a6321de692f796921b77ffb08 /include/asterisk/monitor.h | |
parent | 9888562c8ce7ff0102309361aa26aad819d5ddb3 (diff) |
Remove unneeded uses of optional_api providers.
A few cases exist where headers of optional_api provders are included but
not needed. This causes unneeded calls to ast_optional_api_use.
* Don't include optional_api.h from sip_api.h.
* Move 'struct ast_channel_monitor' to channel.h.
* Don't include monitor.h from chan_sip.c, channel.c or features.c.
The move of struct ast_channel_monitor is needed since channel.c depends on
it. This has no effect on users of monitor.h since channel.h is included
from monitor.h.
ASTERISK-25051 #close
Reported by: Corey Farrell
Change-Id: I53ea65a9fc9693c89f8bcfd6120649bfcfbc3478
Diffstat (limited to 'include/asterisk/monitor.h')
-rw-r--r-- | include/asterisk/monitor.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asterisk/monitor.h b/include/asterisk/monitor.h index 6030221a2..377cb62f6 100644 --- a/include/asterisk/monitor.h +++ b/include/asterisk/monitor.h @@ -26,31 +26,11 @@ #include "asterisk/channel.h" #include "asterisk/optional_api.h" -enum AST_MONITORING_STATE { - AST_MONITOR_RUNNING, - AST_MONITOR_PAUSED -}; - /* Streams recording control */ #define X_REC_IN 1 #define X_REC_OUT 2 #define X_JOIN 4 -/*! Responsible for channel monitoring data */ -struct ast_channel_monitor { - struct ast_filestream *read_stream; - struct ast_filestream *write_stream; - char read_filename[FILENAME_MAX]; - char write_filename[FILENAME_MAX]; - char filename_base[FILENAME_MAX]; - char beep_id[64]; - int filename_changed; - char *format; - int joinfiles; - enum AST_MONITORING_STATE state; - int (*stop)(struct ast_channel *chan, int need_lock); -}; - /* Start monitoring a channel */ AST_OPTIONAL_API(int, ast_monitor_start, (struct ast_channel *chan, const char *format_spec, |