[svn-commits] rmudgett: branch rmudgett/bridge_phase r381697 - in /team/rmudgett/bridge_pha...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Feb 18 15:25:59 2013
New Revision: 381697

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381697
Log:
Rename struct ast_bridge_technology.poke to poke_channel

Modified:
    team/rmudgett/bridge_phase/bridges/bridge_softmix.c
    team/rmudgett/bridge_phase/include/asterisk/bridging_technology.h
    team/rmudgett/bridge_phase/main/bridging.c

Modified: team/rmudgett/bridge_phase/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/bridges/bridge_softmix.c?view=diff&rev=381697&r1=381696&r2=381697
==============================================================================
--- team/rmudgett/bridge_phase/bridges/bridge_softmix.c (original)
+++ team/rmudgett/bridge_phase/bridges/bridge_softmix.c Mon Feb 18 15:25:59 2013
@@ -598,7 +598,7 @@
 }
 
 /*! \brief Function called when the channel's thread is poked */
-static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
+static int softmix_bridge_poke_channel(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
 {
 	struct softmix_channel *sc = bridge_channel->bridge_pvt;
 
@@ -926,7 +926,7 @@
 	.leave = softmix_bridge_leave,
 	.write = softmix_bridge_write,
 	.thread = softmix_bridge_thread,
-	.poke = softmix_bridge_poke,
+	.poke_channel = softmix_bridge_poke_channel,
 };
 
 static int unload_module(void)

Modified: team/rmudgett/bridge_phase/include/asterisk/bridging_technology.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/include/asterisk/bridging_technology.h?view=diff&rev=381697&r1=381696&r2=381697
==============================================================================
--- team/rmudgett/bridge_phase/include/asterisk/bridging_technology.h (original)
+++ team/rmudgett/bridge_phase/include/asterisk/bridging_technology.h Mon Feb 18 15:25:59 2013
@@ -69,8 +69,8 @@
 	int (*fd)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, int fd);
 	/*! Callback for replacement thread function */
 	int (*thread)(struct ast_bridge *bridge);
-	/*! Callback for poking a bridge thread */
-	int (*poke)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
+	/*! Callback for poking a bridge channel thread */
+	int (*poke_channel)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
 	/*! Formats that the bridge technology supports */
 	struct ast_format_cap *format_capabilities;
 	/*! TRUE if the bridge technology is currently suspended. */

Modified: team/rmudgett/bridge_phase/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/bridging.c?view=diff&rev=381697&r1=381696&r2=381697
==============================================================================
--- team/rmudgett/bridge_phase/main/bridging.c (original)
+++ team/rmudgett/bridge_phase/main/bridging.c Mon Feb 18 15:25:59 2013
@@ -527,9 +527,9 @@
 		return;
 	}
 
-	/* If all else fails just poke the bridge */
-	if (bridge->technology->poke && bridge_channel) {
-		bridge->technology->poke(bridge, bridge_channel);
+	/* If all else fails just poke the bridge channel */
+	if (bridge->technology->poke_channel && bridge_channel) {
+		bridge->technology->poke_channel(bridge, bridge_channel);
 		return;
 	}
 }