diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-31 16:15:32 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-31 16:15:32 +0000 |
| commit | 680765d452f3c19ed6be54919503e8c7fad905ce (patch) | |
| tree | 00ccd929bf1317f493de420cf29123985d384e88 /include/asterisk/channel.h | |
| parent | ccc8cc5346f7f68f38b1749755777a33cd897f07 (diff) | |
Remove ast_channel_bridge() and associated code called only by it.
* Added some more BUGBUG notes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index aa5fe8da3..ec39ecf82 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -872,8 +872,6 @@ enum { AST_FLAG_MOH = (1 << 6), /*! This channel is spying on another channel */ AST_FLAG_SPYING = (1 << 7), - /*! This channel is in a native bridge */ - AST_FLAG_NBRIDGE = (1 << 8), /*! the channel is in an auto-incrementing dialplan processor, * so when ->priority is set, it will get incremented before * finding the next priority to run */ @@ -927,7 +925,6 @@ enum { AST_FEATURE_AUTOMON = (1 << 4), AST_FEATURE_PARKCALL = (1 << 5), AST_FEATURE_AUTOMIXMON = (1 << 6), - AST_FEATURE_WARNING_ACTIVE = (1 << 8), }; /*! \brief bridge configuration */ @@ -2005,21 +2002,6 @@ int ast_channel_make_compatible(struct ast_channel *c0, struct ast_channel *c1); int ast_channel_early_bridge(struct ast_channel *c0, struct ast_channel *c1); /*! - * \brief Bridge two channels together - * \param c0 first channel to bridge - * \param c1 second channel to bridge - * \param config config for the channels - * \param fo destination frame(?) - * \param rc destination channel(?) - * \details - * Bridge two channels (c0 and c1) together. If an important frame occurs, we return that frame in - * *rf (remember, it could be NULL) and which channel (0 or 1) in rc - */ -/* int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc); */ -int ast_channel_bridge(struct ast_channel *c0,struct ast_channel *c1, - struct ast_bridge_config *config, struct ast_frame **fo, struct ast_channel **rc); - -/*! * \brief Weird function made for call transfers * * \param original channel to make a copy of |