[asterisk-commits] branch oej/t38passthrough r13321 - /team/oej/t38passthrough/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Fri Mar 17 02:06:16 2006
New Revision: 13321

URL: http://svn.digium.com/view/asterisk?rev=13321&view=rev
Log:
Remove the T38_SUPPORT ifdef on Kevin Fleming's advice

Modified:
    team/oej/t38passthrough/   (props changed)
    team/oej/t38passthrough/Makefile
    team/oej/t38passthrough/asterisk.c
    team/oej/t38passthrough/channel.c
    team/oej/t38passthrough/frame.c

Propchange: team/oej/t38passthrough/
------------------------------------------------------------------------------
    automerge = http://edvina.net

Modified: team/oej/t38passthrough/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/Makefile?rev=13321&r1=13320&r2=13321&view=diff
==============================================================================
--- team/oej/t38passthrough/Makefile (original)
+++ team/oej/t38passthrough/Makefile Fri Mar 17 02:06:16 2006
@@ -430,9 +430,6 @@
 endif
 
 INSTALL=install
-
-#Add T38_SUPPORT by default. Disable by commenting out next line
-CFLAGS+=-DT38_SUPPORT
 
 _all: all
 	@echo " +--------- Asterisk Build Complete ---------+"  

Modified: team/oej/t38passthrough/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/asterisk.c?rev=13321&r1=13320&r2=13321&view=diff
==============================================================================
--- team/oej/t38passthrough/asterisk.c (original)
+++ team/oej/t38passthrough/asterisk.c Fri Mar 17 02:06:16 2006
@@ -107,9 +107,7 @@
 #include "asterisk/pbx.h"
 #include "asterisk/enum.h"
 #include "asterisk/rtp.h"
-#if defined(T38_SUPPORT)
 #include "asterisk/udptl.h"
-#endif
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
@@ -2335,9 +2333,7 @@
 		exit(1);
 	}
 	ast_rtp_init();
-#if defined(T38_SUPPORT)
 	ast_udptl_init();
-#endif
 	if (ast_image_init()) {
 		printf(term_quit());
 		exit(1);

Modified: team/oej/t38passthrough/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/channel.c?rev=13321&r1=13320&r2=13321&view=diff
==============================================================================
--- team/oej/t38passthrough/channel.c (original)
+++ team/oej/t38passthrough/channel.c Fri Mar 17 02:06:16 2006
@@ -2298,14 +2298,12 @@
 		else
 			res = 0;
 		break;
-#ifdef T38_SUPPORT
 	case AST_FRAME_MODEM:
 		if (chan->tech->write)
 			res = chan->tech->write(chan, fr);
 		else
 			res = 0;
 		break;
-#endif
 	case AST_FRAME_VOICE:
 		if (chan->tech->write) {
 			/* Bypass translator if we're writing format in the raw write format.  This
@@ -3345,9 +3343,7 @@
 		    (f->frametype == AST_FRAME_VIDEO) || 
 		    (f->frametype == AST_FRAME_IMAGE) ||
 		    (f->frametype == AST_FRAME_HTML) ||
-#if defined(T38_SUPPORT)
 		    (f->frametype == AST_FRAME_MODEM) ||
-#endif
 		    (f->frametype == AST_FRAME_TEXT)) {
 			if (f->frametype == AST_FRAME_DTMF) {
 				if (((who == c0) && watch_c0_dtmf) ||

Modified: team/oej/t38passthrough/frame.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/frame.c?rev=13321&r1=13320&r2=13321&view=diff
==============================================================================
--- team/oej/t38passthrough/frame.c (original)
+++ team/oej/t38passthrough/frame.c Fri Mar 17 02:06:16 2006
@@ -786,7 +786,6 @@
 			break;
 		}
 		break;
-#ifdef T38_SUPPORT
 	case AST_FRAME_MODEM:
 		strcpy(ftype, "Modem");
 		switch (f->subclass) {
@@ -801,7 +800,6 @@
 			break;
 		}
 		break;
-#endif
 	default:
 		snprintf(ftype, sizeof(ftype), "Unknown Frametype '%d'", f->frametype);
 	}