[svn-commits] file: branch file/bridging r136853 - in /team/file/bridging: apps/ bridges/ c...

[SVN commits to the Digium repositories]

Author: file
Date: Fri Aug  8 17:06:23 2008
New Revision: 136853

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136853
Log:
Bring this up to date with the state of the world.

Removed:
    team/file/bridging/apps/app_dial2.c
Modified:
    team/file/bridging/bridges/bridge_softmix.c
    team/file/bridging/channels/chan_bridge.c

Modified: team/file/bridging/bridges/bridge_softmix.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/bridges/bridge_softmix.c?view=diff&rev=136853&r1=136852&r2=136853
==============================================================================
--- team/file/bridging/bridges/bridge_softmix.c (original)
+++ team/file/bridging/bridges/bridge_softmix.c Fri Aug  8 17:06:23 2008
@@ -82,7 +82,7 @@
 	/* Setup frame parameters */
 	sc->frame.frametype = AST_FRAME_VOICE;
 	sc->frame.subclass = AST_FORMAT_SLINEAR16;
-	sc->frame.data = sc->final_buf;
+	sc->frame.data.ptr = sc->final_buf;
 	sc->frame.datalen = sizeof(sc->final_buf);
 	sc->frame.samples = SOFTMIX_SAMPLES;
 

Modified: team/file/bridging/channels/chan_bridge.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/channels/chan_bridge.c?view=diff&rev=136853&r1=136852&r2=136853
==============================================================================
--- team/file/bridging/channels/chan_bridge.c (original)
+++ team/file/bridging/channels/chan_bridge.c Fri Aug  8 17:06:23 2008
@@ -118,12 +118,12 @@
 	if (p->input == ast) {
 		p->input = NULL;
 		if (p->output) {
-			ast_queue_hangup(p->output, -1);
+			ast_queue_hangup(p->output);
 		}
 	} else if (p->output == ast) {
 		p->output = NULL;
 		if (p->input) {
-			ast_queue_hangup(p->input, -1);
+			ast_queue_hangup(p->input);
 		}
 	}