[Asterisk-cvs] asterisk/channels chan_modem_i4l.c, 1.19, 1.20 alaw.h, 1.3, NONE

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv17468/channels

Modified Files:
	chan_modem_i4l.c 
Removed Files:
	alaw.h 
Log Message:
Remove duplicate alaw implementation (bug #3409)


Index: chan_modem_i4l.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_i4l.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- chan_modem_i4l.c	19 Dec 2004 21:13:41 -0000	1.19
+++ chan_modem_i4l.c	23 Jan 2005 18:47:51 -0000	1.20
@@ -26,7 +26,7 @@
 #include <asterisk/options.h>
 #include <asterisk/dsp.h>
 #include <asterisk/callerid.h>
-#include "alaw.h"
+#include <asterisk/alaw.h>
 
 #define STATE_COMMAND 	0
 #define STATE_VOICE 	1
@@ -420,7 +420,7 @@
 						if (!f)
 							return NULL;
 					} else {
-						*(b++) = ALAW2INT(result[x] & 0xff);
+						*(b++) = AST_A2LIN(result[x]);
 						p->obuflen += 2;
 					}
 				}
@@ -480,7 +480,7 @@
 		return -1;
 	}
 	for (x=0;x<f->datalen/2;x++) {
-		b = INT2ALAW(((short *)f->data)[x]);
+		b = AST_ALAW(((short *)f->data)[x]);
 		result[bpos++] = b;
 		if (b == CHAR_DLE)
 			result[bpos++]=b;

--- alaw.h DELETED ---