diff options
| -rw-r--r-- | channels/chan_vpb.cc | 8 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 16 | ||||
| -rw-r--r-- | main/channel.c | 4 |
3 files changed, 0 insertions, 28 deletions
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 7b0b9accb..408776c1c 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -378,7 +378,6 @@ static struct ast_channel_tech vpb_tech = { send_image: NULL, send_html: NULL, exception: NULL, - bridge: NULL, early_bridge: NULL, indicate: vpb_indicate, fixup: vpb_fixup, @@ -387,11 +386,8 @@ static struct ast_channel_tech vpb_tech = { transfer: NULL, write_video: NULL, write_text: NULL, - bridged_channel: NULL, func_channel_read: NULL, func_channel_write: NULL, - get_base_channel: NULL, - set_base_channel: NULL }; static struct ast_channel_tech vpb_tech_indicate = { @@ -412,7 +408,6 @@ static struct ast_channel_tech vpb_tech_indicate = { send_image: NULL, send_html: NULL, exception: NULL, - bridge: NULL, early_bridge: NULL, indicate: NULL, fixup: vpb_fixup, @@ -421,11 +416,8 @@ static struct ast_channel_tech vpb_tech_indicate = { transfer: NULL, write_video: NULL, write_text: NULL, - bridged_channel: NULL, func_channel_read: NULL, func_channel_write: NULL, - get_base_channel: NULL, - set_base_channel: NULL }; #if defined(VPB_NATIVE_BRIDGING) diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ad229a932..488004fe2 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -652,11 +652,6 @@ struct ast_channel_tech { /*! \brief Handle an exception, reading a frame */ struct ast_frame * (* const exception)(struct ast_channel *chan); -/* BUGBUG this tech callback is to be removed. */ - /*! \brief Bridge two channels of the same type together */ - 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); @@ -681,10 +676,6 @@ struct ast_channel_tech { /*! \brief Write a text frame, in standard format */ int (* const write_text)(struct ast_channel *chan, struct ast_frame *frame); -/* BUGBUG this tech callback is to be removed. */ - /*! \brief Find bridged channel */ - struct ast_channel *(* const bridged_channel)(struct ast_channel *chan, struct ast_channel *bridge); - /*! * \brief Provide additional read items for CHANNEL() dialplan function * \note data should be treated as a const char *. @@ -697,13 +688,6 @@ struct ast_channel_tech { */ int (* func_channel_write)(struct ast_channel *chan, const char *function, char *data, const char *value); -/* BUGBUG this tech callback is to be removed. */ - /*! \brief Retrieve base channel (agent and local) */ - struct ast_channel* (* get_base_channel)(struct ast_channel *chan); - - /*! \brief Set base channel (agent and local) */ - int (* set_base_channel)(struct ast_channel *chan, struct ast_channel *base); - /*! \brief Get the unique identifier for the PVT, i.e. SIP call-ID for SIP */ const char * (* get_pvt_uniqueid)(struct ast_channel *chan); diff --git a/main/channel.c b/main/channel.c index 9bfe2fabe..c5ff77b86 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7316,18 +7316,14 @@ static int data_channeltypes_provider_handler(const struct ast_data_search *sear ast_data_add_bool(data_type, "send_image", cl->tech->send_image ? 1 : 0); ast_data_add_bool(data_type, "send_html", cl->tech->send_html ? 1 : 0); ast_data_add_bool(data_type, "exception", cl->tech->exception ? 1 : 0); - ast_data_add_bool(data_type, "bridge", cl->tech->bridge ? 1 : 0); ast_data_add_bool(data_type, "early_bridge", cl->tech->early_bridge ? 1 : 0); ast_data_add_bool(data_type, "fixup", cl->tech->fixup ? 1 : 0); ast_data_add_bool(data_type, "setoption", cl->tech->setoption ? 1 : 0); ast_data_add_bool(data_type, "queryoption", cl->tech->queryoption ? 1 : 0); ast_data_add_bool(data_type, "write_video", cl->tech->write_video ? 1 : 0); ast_data_add_bool(data_type, "write_text", cl->tech->write_text ? 1 : 0); - ast_data_add_bool(data_type, "bridged_channel", cl->tech->bridged_channel ? 1 : 0); ast_data_add_bool(data_type, "func_channel_read", cl->tech->func_channel_read ? 1 : 0); ast_data_add_bool(data_type, "func_channel_write", cl->tech->func_channel_write ? 1 : 0); - ast_data_add_bool(data_type, "get_base_channel", cl->tech->get_base_channel ? 1 : 0); - ast_data_add_bool(data_type, "set_base_channel", cl->tech->set_base_channel ? 1 : 0); ast_data_add_bool(data_type, "get_pvt_uniqueid", cl->tech->get_pvt_uniqueid ? 1 : 0); ast_data_add_bool(data_type, "cc_callback", cl->tech->cc_callback ? 1 : 0); |