[svn-commits] mmichelson: branch mmichelson/digit_manipulation r197076 - /team/mmichelson/d...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed May 27 09:30:03 2009
New Revision: 197076

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197076
Log:
Move the connected line handler in ast_generic_bridge to an appropriate place.

Thanks, Kevin.


Modified:
    team/mmichelson/digit_manipulation/main/channel.c

Modified: team/mmichelson/digit_manipulation/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/main/channel.c?view=diff&rev=197076&r1=197075&r2=197076
==============================================================================
--- team/mmichelson/digit_manipulation/main/channel.c (original)
+++ team/mmichelson/digit_manipulation/main/channel.c Wed May 27 09:30:03 2009
@@ -5007,11 +5007,6 @@
 			int bridge_exit = 0;
 
 			switch (f->subclass) {
-			case AST_CONTROL_HOLD:
-			case AST_CONTROL_UNHOLD:
-			case AST_CONTROL_VIDUPDATE:
-			case AST_CONTROL_T38:
-			case AST_CONTROL_SRCUPDATE:
 			case AST_CONTROL_CONNECTED_LINE:
 				if (ast_channel_connected_line_macro(who, other, f, other == c0, 1)) {
 					ast_indicate_data(other, f->subclass, f->data.ptr, f->datalen);
@@ -5020,6 +5015,11 @@
 					ast_jb_empty_and_reset(c0, c1);
 				}
 				break;
+			case AST_CONTROL_HOLD:
+			case AST_CONTROL_UNHOLD:
+			case AST_CONTROL_VIDUPDATE:
+			case AST_CONTROL_T38:
+			case AST_CONTROL_SRCUPDATE:
 			case AST_CONTROL_REDIRECTING:
 				ast_indicate_data(other, f->subclass, f->data.ptr, f->datalen);
 				if (jb_in_use) {