Merge "Remove unneeded uses of optional_api providers."
authorMatt Jordan <mjordan@digium.com>
Mon, 4 May 2015 09:04:04 +0000 (04:04 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 4 May 2015 09:04:04 +0000 (04:04 -0500)
channels/chan_sip.c
include/asterisk/channel.h
include/asterisk/monitor.h
include/asterisk/sip_api.h
main/channel.c
main/features.c

index aa616cd..468bfbe 100644 (file)
@@ -254,7 +254,6 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/astobj2.h"
 #include "asterisk/dnsmgr.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/monitor.h"
 #include "asterisk/netsock2.h"
 #include "asterisk/localtime.h"
 #include "asterisk/abstract_jb.h"
index 85ff895..fffbe5c 100644 (file)
@@ -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);
index 6030221..377cb62 100644 (file)
 #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,
index 2b8a3f2..fddac16 100644 (file)
@@ -23,7 +23,6 @@
 extern "C" {
 #endif
 
-#include "asterisk/optional_api.h"
 #include "asterisk/config.h"
 
 #define AST_SIP_API_VERSION 1
index fee7763..fbdf17b 100644 (file)
@@ -53,7 +53,6 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/chanvars.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/indications.h"
-#include "asterisk/monitor.h"
 #include "asterisk/causes.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
index 4acd8aa..618f91c 100644 (file)
@@ -66,7 +66,6 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/utils.h"
 #include "asterisk/adsi.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/monitor.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/global_datastores.h"
 #include "asterisk/astobj2.h"