From dbcef163a2452f3e65f99a2e5484c38926b2f948 Mon Sep 17 00:00:00 2001 From: Michiel van Baak Date: Thu, 22 May 2008 17:06:00 +0000 Subject: forgot chan_misdn git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117822 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_misdn.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'channels') diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index fc36785a3..fa2c37687 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2852,7 +2852,7 @@ static struct ast_frame *misdn_read(struct ast_channel *ast) tmp->frame.offset = 0; tmp->frame.delivery = ast_tv(0,0); tmp->frame.src = NULL; - tmp->frame.data = tmp->ast_rd_buf; + tmp->frame.data.ptr = tmp->ast_rd_buf; if (tmp->faxdetect && !tmp->faxhandled) { if (tmp->faxdetect_timeout) { @@ -2948,7 +2948,7 @@ static int misdn_write(struct ast_channel *ast, struct ast_frame *frame) ast_debug(1, "write2mISDN %p %d bytes: ", p, frame->samples); for (i = 0; i < max ; i++) - ast_debug(1, "%2.2x ", ((char*) frame->data)[i]); + ast_debug(1, "%2.2x ", ((char*) frame->data.ptr)[i]); } #endif @@ -2973,14 +2973,14 @@ static int misdn_write(struct ast_channel *ast, struct ast_frame *frame) chan_misdn_log(9, ch->bc->port, "Sending :%d bytes 2 MISDN\n", frame->samples); if ( !ch->bc->nojitter && misdn_cap_is_speech(ch->bc->capability) ) { /* Buffered Transmit (triggert by read from isdn side)*/ - if (misdn_jb_fill(ch->jb, frame->data, frame->samples) < 0) { + if (misdn_jb_fill(ch->jb, frame->data.ptr, frame->samples) < 0) { if (ch->bc->active) cb_log(0, ch->bc->port, "Misdn Jitterbuffer Overflow.\n"); } } else { /*transmit without jitterbuffer*/ - i=misdn_lib_tx2misdn_frm(ch->bc, frame->data, frame->samples); + i=misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples); } return 0; @@ -3120,7 +3120,7 @@ static int dialtone_indicate(struct chan_list *cl) cl->notxtone = 0; cl->norxtone = 0; /* This prods us in misdn_write */ - ast_playtones_start(ast, 0, ts->data, 0); + ast_playtones_start(ast, 0, ts->data.ptr, 0); } return 0; @@ -3801,7 +3801,7 @@ static void do_immediate_setup(struct misdn_bchannel *bc, struct chan_list *ch, fr.frametype = AST_FRAME_DTMF; fr.subclass = *predial; fr.src = NULL; - fr.data = NULL; + fr.data.ptr = NULL; fr.datalen = 0; fr.samples = 0; fr.mallocd = 0; @@ -4086,7 +4086,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) fr.frametype = AST_FRAME_DTMF; fr.subclass = bc->dtmf ; fr.src = NULL; - fr.data = NULL; + fr.data.ptr = NULL; fr.datalen = 0; fr.samples = 0; fr.mallocd = 0; @@ -4183,7 +4183,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) fr.frametype = AST_FRAME_DTMF; fr.subclass = bc->info_dad[0] ; fr.src = NULL; - fr.data = NULL; + fr.data.ptr = NULL; fr.datalen = 0; fr.samples = 0; fr.mallocd = 0; @@ -4756,7 +4756,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) frame.offset = 0; frame.delivery = ast_tv(0,0); frame.src = NULL; - frame.data = bc->bframe; + frame.data.ptr = bc->bframe; if (ch->ast) ast_queue_frame(ch->ast, &frame); -- cgit v1.2.3