[asterisk-commits] mvanbaak: trunk r117822 - /trunk/channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Thu May 22 12:06:00 2008
New Revision: 117822

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117822
Log:
forgot chan_misdn

Modified:
    trunk/channels/chan_misdn.c

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=117822&r1=117821&r2=117822
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Thu May 22 12:06:00 2008
@@ -2852,7 +2852,7 @@
 	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 @@
 		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 @@
 	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 @@
 		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 @@
 		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 @@
 		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 @@
 			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 @@
 			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);