diff options
| author | Corey Farrell <git@cfware.com> | 2015-05-02 19:58:40 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-05-02 19:31:12 -0500 |
| commit | c3ec5da156a232b488262cb84d8c66054134b74e (patch) | |
| tree | dd3b18a4ad64078f45ecf19d94b9237fcd61cd27 /include | |
| parent | 2be861173ae177662f4bdaf8cf8da39a031d4369 (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')
| -rw-r--r-- | include/asterisk/channel.h | 20 | ||||
| -rw-r--r-- | include/asterisk/monitor.h | 20 | ||||
| -rw-r--r-- | include/asterisk/sip_api.h | 1 |
3 files changed, 20 insertions, 21 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 85ff89588..fffbe5c09 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -3885,6 +3885,26 @@ enum ama_flags ast_channel_string2amaflag(const char *flag); */ const char *ast_channel_amaflags2string(enum ama_flags flags); +enum AST_MONITORING_STATE { + AST_MONITOR_RUNNING, + AST_MONITOR_PAUSED +}; + +/*! 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); +}; + /* ACCESSOR FUNTIONS */ /*! \brief Set the channel name */ void ast_channel_name_set(struct ast_channel *chan, const char *name); 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, diff --git a/include/asterisk/sip_api.h b/include/asterisk/sip_api.h index 2b8a3f2a1..fddac16e0 100644 --- a/include/asterisk/sip_api.h +++ b/include/asterisk/sip_api.h @@ -23,7 +23,6 @@ extern "C" { #endif -#include "asterisk/optional_api.h" #include "asterisk/config.h" #define AST_SIP_API_VERSION 1 |