From 69399315991bf7f9679e2d9b22f42415653cfc04 Mon Sep 17 00:00:00 2001 From: markster Date: Fri, 29 Nov 2002 02:14:13 +0000 Subject: Version 0.3.0 from FTP git-svn-id: http://svn.digium.com/svn/asterisk/trunk@556 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_alsa.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'channels/chan_alsa.c') diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 3e35a821f..225c8ba74 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -646,7 +646,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan) f.frametype = AST_FRAME_NULL; f.subclass = 0; - f.timelen = 0; + f.samples = 0; f.datalen = 0; f.data = NULL; f.offset = 0; @@ -728,7 +728,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan) } f.frametype = AST_FRAME_VOICE; f.subclass = AST_FORMAT_SLINEAR; - f.timelen = FRAME_SIZE / 8; + f.samples = FRAME_SIZE; f.datalen = FRAME_SIZE * 2; f.data = buf; f.offset = AST_FRIENDLY_OFFSET; @@ -905,8 +905,8 @@ static char sendtext_usage[] = static int console_sendtext(int fd, int argc, char *argv[]) { - int tmparg = 1; - if (argc < 1) + int tmparg = 2; + if (argc < 2) return RESULT_SHOWUSAGE; if (!alsa.owner) { ast_cli(fd, "No one is calling us\n"); @@ -968,9 +968,11 @@ static int console_dial(int fd, int argc, char *argv[]) mye = exten; myc = context; if (argc == 2) { + char *stringp=NULL; strncpy(tmp, argv[1], sizeof(tmp)-1); - strtok(tmp, "@"); - tmp2 = strtok(NULL, "@"); + stringp=tmp; + strsep(&stringp, "@"); + tmp2 = strsep(&stringp, "@"); if (strlen(tmp)) mye = tmp; if (tmp2 && strlen(tmp2)) @@ -995,7 +997,7 @@ static struct ast_cli_entry myclis[] = { { { "answer", NULL }, console_answer, "Answer an incoming console call", answer_usage }, { { "hangup", NULL }, console_hangup, "Hangup a call on the console", hangup_usage }, { { "dial", NULL }, console_dial, "Dial an extension on the console", dial_usage }, - { { "send text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage }, + { { "send", "text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage }, { { "autoanswer", NULL }, console_autoanswer, "Sets/displays autoanswer", autoanswer_usage, autoanswer_complete } }; -- cgit v1.2.3