[svn-commits] rmudgett: trunk r396713 - in /trunk: channels/ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 14 19:16:39 2013
New Revision: 396713

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396713
Log:
Remove unsupported channel technology callbacks.

Modified:
    trunk/channels/chan_vpb.cc
    trunk/include/asterisk/channel.h
    trunk/main/channel.c

Modified: trunk/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=396713&r1=396712&r2=396713
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Wed Aug 14 19:16:39 2013
@@ -378,7 +378,6 @@
 	send_image: NULL,
 	send_html: NULL,
 	exception: NULL,
-	bridge: NULL,
 	early_bridge: NULL,
 	indicate: vpb_indicate,
 	fixup: vpb_fixup,
@@ -387,11 +386,8 @@
 	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 @@
 	send_image: NULL,
 	send_html: NULL,
 	exception: NULL,
-	bridge: NULL,
 	early_bridge: NULL,
 	indicate: NULL,
 	fixup: vpb_fixup,
@@ -421,11 +416,8 @@
 	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)

Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=396713&r1=396712&r2=396713
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Wed Aug 14 19:16:39 2013
@@ -652,11 +652,6 @@
 	/*! \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);
 
@@ -680,10 +675,6 @@
 
 	/*! \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
@@ -696,13 +687,6 @@
 	 * \note data should be treated as a const char *.
 	 */
 	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);

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=396713&r1=396712&r2=396713
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Aug 14 19:16:39 2013
@@ -7316,18 +7316,14 @@
 		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);