aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_modem_i4l.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-23 18:47:51 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-23 18:47:51 +0000
commitae74ad6e2bbbe6eb49d2ff89791fe93c03aeb8fd (patch)
treecdb5271975e21b19116dadcfc34c9ff7c5929735 /channels/chan_modem_i4l.c
parent64395b9b51d72b0a9fce569a58271d2e385dac9e (diff)
Remove duplicate alaw implementation (bug #3409)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4882 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_modem_i4l.c')
-rwxr-xr-xchannels/chan_modem_i4l.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_modem_i4l.c b/channels/chan_modem_i4l.c
index 0fbf5d49c..2e97ee478 100755
--- a/channels/chan_modem_i4l.c
+++ b/channels/chan_modem_i4l.c
@@ -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 @@ static struct ast_frame *i4l_read(struct ast_modem_pvt *p)
if (!f)
return NULL;
} else {
- *(b++) = ALAW2INT(result[x] & 0xff);
+ *(b++) = AST_A2LIN(result[x]);
p->obuflen += 2;
}
}
@@ -480,7 +480,7 @@ static int i4l_write(struct ast_modem_pvt *p, struct ast_frame *f)
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;