diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/channel.h | 10 | ||||
-rw-r--r-- | include/asterisk/rtp.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index d54a1bdd7..4f636d185 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -238,6 +238,9 @@ struct ast_channel_tech { enum ast_bridge_result (* const bridge)(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms); + /*! \brief Bridge two channels of the same type together (early) */ + enum ast_bridge_result (* const early_bridge)(struct ast_channel *c0, struct ast_channel *c1); + /*! \brief Indicate a particular condition (e.g. AST_CONTROL_BUSY or AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */ int (* const indicate)(struct ast_channel *c, int condition, const void *data, size_t datalen); @@ -965,6 +968,13 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in * \return Returns 0 on success and -1 if it could not be done */ int ast_channel_make_compatible(struct ast_channel *c0, struct ast_channel *c1); +/*! Bridge two channels together (early) + * \param c0 first channel to bridge + * \param c1 second channel to bridge + * Bridge two channels (c0 and c1) together early. This implies either side may not be answered yet. + * \return Returns 0 on success and -1 if it could not be done */ +int ast_channel_early_bridge(struct ast_channel *c0, struct ast_channel *c1); + /*! Bridge two channels together * \param c0 first channel to bridge * \param c1 second channel to bridge diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index c332159ec..03f204453 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -196,7 +196,7 @@ int ast_rtp_make_compatible(struct ast_channel *dest, struct ast_channel *src, i /*! \brief If possible, create an early bridge directly between the devices without having to send a re-invite later */ -int ast_rtp_early_bridge(struct ast_channel *dest, struct ast_channel *src); +int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1); void ast_rtp_stop(struct ast_rtp *rtp); |