[asterisk-commits] rmudgett: branch rmudgett/display_text r305694 - /team/rmudgett/display_text/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Feb  1 17:06:13 2011
New Revision: 305694

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305694
Log:
Make chan_dahdi native bridge handle AST_FRAME_TEXT.

Modified:
    team/rmudgett/display_text/channels/chan_dahdi.c

Modified: team/rmudgett/display_text/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/display_text/channels/chan_dahdi.c?view=diff&rev=305694&r1=305693&r2=305694
==============================================================================
--- team/rmudgett/display_text/channels/chan_dahdi.c (original)
+++ team/rmudgett/display_text/channels/chan_dahdi.c Tue Feb  1 17:06:13 2011
@@ -7329,13 +7329,13 @@
 			continue;
 		}
 		f = ast_read(who);
-		if (!f || (f->frametype == AST_FRAME_CONTROL)) {
+		switch (f ? f->frametype : AST_FRAME_CONTROL) {
+		case AST_FRAME_CONTROL:
 			*fo = f;
 			*rc = who;
 			res = AST_BRIDGE_COMPLETE;
 			goto return_from_bridge;
-		}
-		if (f->frametype == AST_FRAME_DTMF) {
+		case AST_FRAME_DTMF_END:
 			if ((who == c0) && p0->pulsedial) {
 				ast_write(c1, f);
 			} else if ((who == c1) && p1->pulsedial) {
@@ -7346,6 +7346,19 @@
 				res = AST_BRIDGE_COMPLETE;
 				goto return_from_bridge;
 			}
+			break;
+		case AST_FRAME_TEXT:
+			if (who == c0) {
+				ast_write(c1, f);
+			} else {
+				ast_write(c0, f);
+			}
+			break;
+		case AST_FRAME_NULL:
+			break;
+		default:
+			ast_debug(1, "Discarding frame of frametype:%d\n", f->frametype);
+			break;
 		}
 		ast_frfree(f);