[svn-commits] file: trunk r600 - in /trunk: apps/ channels/ formats/

[SVN commits to the Digium repositories]

Author: file
Date: Wed May 28 09:36:38 2008
New Revision: 600

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=600
Log:
Fix building of asterisk-addons against latest trunk.
(closes issue #12739)
Reported by: softins
Patches:
      format_mp3-trunk-diff.txt uploaded by softins (license 197)

Modified:
    trunk/apps/app_fax.c
    trunk/channels/chan_mobile.c
    trunk/channels/chan_ooh323.c
    trunk/formats/format_mp3.c

Modified: trunk/apps/app_fax.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/apps/app_fax.c?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- trunk/apps/app_fax.c (original)
+++ trunk/apps/app_fax.c Wed May 28 09:36:38 2008
@@ -401,7 +401,7 @@
 		   to slinear so it will still be received by ast_read */
 		if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) {
 
-			if (fax_rx(&fax, inf->data, inf->samples) < 0) {
+			if (fax_rx(&fax, inf->data.ptr, inf->samples) < 0) {
 				/* I know fax_rx never returns errors. The check here is for good style only */
 				ast_log(LOG_WARNING, "fax_rx returned error\n");
 				res = -1;
@@ -415,7 +415,7 @@
 			}
 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
 				inf->datalen == sizeof(enum ast_control_t38)) {
-			t38control =*((enum ast_control_t38 *) inf->data);
+			t38control =*((enum ast_control_t38 *) inf->data.ptr);
 			if (t38control == AST_T38_NEGOTIATED) {
 				/* T38 switchover completed */
 				ast_debug(1, "T38 negotiated, finishing audio loop\n");
@@ -520,7 +520,7 @@
 		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
 
 		if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) {
-			t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno);
+			t38_core_rx_ifp_packet(&t38.t38, inf->data.ptr, inf->datalen, inf->seqno);
 
 			/* Watchdog */
 			if (last_state != t38.t30_state.state) {
@@ -530,7 +530,7 @@
 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
 				inf->datalen == sizeof(enum ast_control_t38)) {
 
-			t38control = *((enum ast_control_t38 *) inf->data);
+			t38control = *((enum ast_control_t38 *) inf->data.ptr);
 
 			if (t38control == AST_T38_TERMINATED || t38control == AST_T38_REFUSED) {
 				ast_debug(1, "T38 down, terminating\n");

Modified: trunk/channels/chan_mobile.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/channels/chan_mobile.c?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- trunk/channels/chan_mobile.c (original)
+++ trunk/channels/chan_mobile.c Wed May 28 09:36:38 2008
@@ -787,9 +787,9 @@
 	pvt->fr.mallocd = 0;
 	pvt->fr.delivery.tv_sec = 0;
 	pvt->fr.delivery.tv_usec = 0;
-	pvt->fr.data = pvt->io_buf + AST_FRIENDLY_OFFSET;
-
-	if ((r = read(pvt->io_pipe[0], pvt->fr.data, CHANNEL_FRAME_SIZE)) != CHANNEL_FRAME_SIZE) {
+	pvt->fr.data.ptr = pvt->io_buf + AST_FRIENDLY_OFFSET;
+
+	if ((r = read(pvt->io_pipe[0], pvt->fr.data.ptr, CHANNEL_FRAME_SIZE)) != CHANNEL_FRAME_SIZE) {
 		if (r == -1) {
 			ast_log(LOG_ERROR, "read error %d\n", errno);
 			return &ast_null_frame;
@@ -825,7 +825,7 @@
 	io_need = 0;
 	if (pvt->io_save_len > 0) {
 		io_need = DEVICE_FRAME_SIZE - pvt->io_save_len;
-		memcpy(pvt->io_save_buf + pvt->io_save_len, frame->data, io_need);
+		memcpy(pvt->io_save_buf + pvt->io_save_len, frame->data.ptr, io_need);
 		sco_write(pvt->sco_socket, pvt->io_save_buf, DEVICE_FRAME_SIZE);
 		if ((r = sco_read(pvt->sco_socket, buf, DEVICE_FRAME_SIZE))) {
 			if (pvt->do_alignment_detection)
@@ -836,7 +836,7 @@
 	}
 
 	num_frames = (frame->datalen - io_need) / DEVICE_FRAME_SIZE;
-	pfr = frame->data + io_need;
+	pfr = frame->data.ptr + io_need;
 
 	for (i=0; i<num_frames; i++) {
 		sco_write(pvt->sco_socket, pfr, DEVICE_FRAME_SIZE);

Modified: trunk/channels/chan_ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/channels/chan_ooh323.c?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- trunk/channels/chan_ooh323.c (original)
+++ trunk/channels/chan_ooh323.c Wed May 28 09:36:38 2008
@@ -1162,7 +1162,7 @@
    f.datalen = 0;
    f.samples = 800;
    f.offset = 0;
-   f.data = NULL;
+   f.data.ptr = NULL;
    f.mallocd = 0;
    f.src = "SEND_DIGIT";
    ast_mutex_unlock(&p->lock);
@@ -1468,7 +1468,7 @@
             ooh323_convert_hangupcause_h323ToAsterisk(call->callEndReason);
          p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
          ast_channel_unlock(p->owner);
-         ast_queue_hangup(p->owner, -1);
+         ast_queue_hangup(p->owner);
          ast_mutex_unlock(&p->lock);
          return OO_OK;
       }

Modified: trunk/formats/format_mp3.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/formats/format_mp3.c?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- trunk/formats/format_mp3.c (original)
+++ trunk/formats/format_mp3.c Wed May 28 09:36:38 2008
@@ -97,7 +97,7 @@
 	
 	InitMP3(&p->mp, OUTSCALE);
 	p->dbuflen = 0;
-	s->fr.data = s->buf;
+	s->fr.data.ptr = s->buf;
 	s->fr.frametype = AST_FRAME_VOICE;
 	s->fr.subclass = AST_FORMAT_SLINEAR;
 	/* datalen will vary for each frame */
@@ -232,7 +232,7 @@
 	s->fr.subclass = AST_FORMAT_SLINEAR;
 	s->fr.offset = AST_FRIENDLY_OFFSET;
 	s->fr.datalen = p->buflen;
-	s->fr.data = s->buf;
+	s->fr.data.ptr = s->buf;
 	s->fr.mallocd = 0;
 	s->fr.samples = delay;
 	*whennext = delay;