[asterisk-commits] mvanbaak: branch mvanbaak/ast_frame_dataunion r117246 - /team/mvanbaak/ast_fr...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 19 16:40:19 CDT 2008
Author: mvanbaak
Date: Mon May 19 16:40:19 2008
New Revision: 117246
URL: http://svn.digium.com/view/asterisk?view=rev&rev=117246
Log:
make apps/ compile after the ast_frame.data => ast_frame.data.ptr change
Modified:
team/mvanbaak/ast_frame_dataunion/apps/app_alarmreceiver.c
team/mvanbaak/ast_frame_dataunion/apps/app_chanspy.c
team/mvanbaak/ast_frame_dataunion/apps/app_dial.c
team/mvanbaak/ast_frame_dataunion/apps/app_festival.c
team/mvanbaak/ast_frame_dataunion/apps/app_ices.c
team/mvanbaak/ast_frame_dataunion/apps/app_meetme.c
team/mvanbaak/ast_frame_dataunion/apps/app_milliwatt.c
team/mvanbaak/ast_frame_dataunion/apps/app_mp3.c
team/mvanbaak/ast_frame_dataunion/apps/app_nbscat.c
team/mvanbaak/ast_frame_dataunion/apps/app_sms.c
team/mvanbaak/ast_frame_dataunion/apps/app_speech_utils.c
team/mvanbaak/ast_frame_dataunion/apps/app_test.c
team/mvanbaak/ast_frame_dataunion/apps/app_zapbarge.c
team/mvanbaak/ast_frame_dataunion/apps/app_zapscan.c
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_alarmreceiver.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_alarmreceiver.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_alarmreceiver.c Mon May 19 16:40:19 2008
@@ -185,7 +185,7 @@
wf.subclass = AST_FORMAT_ULAW;
wf.offset = AST_FRIENDLY_OFFSET;
wf.mallocd = 0;
- wf.data = tone_block.buf;
+ wf.data.ptr = tone_block.buf;
wf.datalen = f->datalen;
wf.samples = wf.datalen;
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_chanspy.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_chanspy.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_chanspy.c Mon May 19 16:40:19 2008
@@ -263,7 +263,7 @@
}
if (csth->fd)
- write(csth->fd, f->data, f->datalen);
+ write(csth->fd, f->data.ptr, f->datalen);
ast_frfree(f);
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_dial.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_dial.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_dial.c Mon May 19 16:40:19 2008
@@ -765,7 +765,7 @@
}
break;
case AST_FRAME_HTML:
- if (!ast_test_flag64(outgoing, DIAL_NOFORWARDHTML) && ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1) {
+ if (!ast_test_flag64(outgoing, DIAL_NOFORWARDHTML) && ast_channel_sendhtml(in, f->subclass, f->data.ptr, f->datalen) == -1) {
ast_log(LOG_WARNING, "Unable to send URL\n");
}
break;
@@ -825,7 +825,7 @@
/* Forward HTML stuff */
if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag64(outgoing, DIAL_NOFORWARDHTML))
- if (ast_channel_sendhtml(outgoing->chan, f->subclass, f->data, f->datalen) == -1)
+ if (ast_channel_sendhtml(outgoing->chan, f->subclass, f->data.ptr, f->datalen) == -1)
ast_log(LOG_WARNING, "Unable to send URL\n");
if (single && ((f->frametype == AST_FRAME_VOICE) || (f->frametype == AST_FRAME_DTMF_BEGIN) || (f->frametype == AST_FRAME_DTMF_END))) {
@@ -838,7 +838,7 @@
(f->subclass == AST_CONTROL_VIDUPDATE) ||
(f->subclass == AST_CONTROL_SRCUPDATE))) {
ast_verb(3, "%s requested special control %d, passing it to %s\n", in->name, f->subclass, outgoing->chan->name);
- ast_indicate_data(outgoing->chan, f->subclass, f->data, f->datalen);
+ ast_indicate_data(outgoing->chan, f->subclass, f->data.ptr, f->datalen);
}
ast_frfree(f);
}
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_festival.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_festival.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_festival.c Mon May 19 16:40:19 2008
@@ -218,7 +218,7 @@
myf.f.samples = res / 2;
myf.f.offset = AST_FRIENDLY_OFFSET;
myf.f.src = __PRETTY_FUNCTION__;
- myf.f.data = myf.frdata;
+ myf.f.data.ptr = myf.frdata;
if (ast_write(chan, &myf.f) < 0) {
res = -1;
ast_frfree(f);
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_ices.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_ices.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_ices.c Mon May 19 16:40:19 2008
@@ -157,7 +157,7 @@
break;
}
if (f->frametype == AST_FRAME_VOICE) {
- res = write(fds[1], f->data, f->datalen);
+ res = write(fds[1], f->data.ptr, f->datalen);
if (res < 0) {
if (errno != EAGAIN) {
ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno));
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_meetme.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_meetme.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_meetme.c Mon May 19 16:40:19 2008
@@ -2342,7 +2342,7 @@
to write out all the samples.
*/
if (user->talking)
- careful_write(fd, f->data, f->datalen, 0);
+ careful_write(fd, f->data.ptr, f->datalen, 0);
}
} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) {
char tmp[2];
@@ -2566,7 +2566,7 @@
fr.subclass = AST_FORMAT_SLINEAR;
fr.datalen = res;
fr.samples = res / 2;
- fr.data = buf;
+ fr.data.ptr = buf;
fr.offset = AST_FRIENDLY_OFFSET;
if (!user->listen.actual &&
((confflags & CONFFLAG_MONITOR) ||
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_milliwatt.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_milliwatt.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_milliwatt.c Mon May 19 16:40:19 2008
@@ -63,7 +63,7 @@
.offset = AST_FRIENDLY_OFFSET,
.src = __FUNCTION__,
};
- wf.data = buf + AST_FRIENDLY_OFFSET;
+ wf.data.ptr = buf + AST_FRIENDLY_OFFSET;
/* Instead of len, use samples, because channel.c generator_force
* generate(chan, tmp, 0, 160) ignores len. In any case, len is
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_mp3.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_mp3.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_mp3.c Mon May 19 16:40:19 2008
@@ -167,7 +167,7 @@
myf.f.src = __PRETTY_FUNCTION__;
myf.f.delivery.tv_sec = 0;
myf.f.delivery.tv_usec = 0;
- myf.f.data = myf.frdata;
+ myf.f.data.ptr = myf.frdata;
if (ast_write(chan, &myf.f) < 0) {
res = -1;
break;
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_nbscat.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_nbscat.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_nbscat.c Mon May 19 16:40:19 2008
@@ -150,7 +150,7 @@
myf.f.src = __PRETTY_FUNCTION__;
myf.f.delivery.tv_sec = 0;
myf.f.delivery.tv_usec = 0;
- myf.f.data = myf.frdata;
+ myf.f.data.ptr = myf.frdata;
if (ast_write(chan, &myf.f) < 0) {
res = -1;
break;
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_sms.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_sms.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_sms.c Mon May 19 16:40:19 2008
@@ -1501,7 +1501,7 @@
f.datalen = samples * sizeof(*buf);
f.offset = AST_FRIENDLY_OFFSET;
f.mallocd = 0;
- f.data = buf;
+ f.data.ptr = buf;
f.samples = samples;
f.src = "app_sms";
/* create a buffer containing the digital sms pattern */
@@ -1905,7 +1905,7 @@
break;
}
if (f->frametype == AST_FRAME_VOICE) {
- sms_process(&h, f->samples, f->data);
+ sms_process(&h, f->samples, f->data.ptr);
}
ast_frfree(f);
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_speech_utils.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_speech_utils.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_speech_utils.c Mon May 19 16:40:19 2008
@@ -647,7 +647,7 @@
}
/* Write audio frame out to speech engine if no DTMF has been received */
if (!strlen(dtmf) && f != NULL && f->frametype == AST_FRAME_VOICE) {
- ast_speech_write(speech, f->data, f->datalen);
+ ast_speech_write(speech, f->data.ptr, f->datalen);
}
break;
case AST_SPEECH_STATE_WAIT:
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_test.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_test.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_test.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_test.c Mon May 19 16:40:19 2008
@@ -84,7 +84,7 @@
break;
}
if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) {
- foo = (short *)f->data;
+ foo = (short *)f->data.ptr;
for (x=0;x<f->samples;x++) {
noise += abs(foo[x]);
samples++;
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_zapbarge.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_zapbarge.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_zapbarge.c Mon May 19 16:40:19 2008
@@ -207,7 +207,7 @@
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) {
/* Carefully write */
- careful_write(fd, f->data, f->datalen);
+ careful_write(fd, f->data.ptr, f->datalen);
} else
ast_log(LOG_WARNING, "Huh? Got a non-ulaw (%d) frame in the conference\n", f->subclass);
}
@@ -221,7 +221,7 @@
fr.subclass = AST_FORMAT_ULAW;
fr.datalen = res;
fr.samples = res;
- fr.data = buf;
+ fr.data.ptr = buf;
fr.offset = AST_FRIENDLY_OFFSET;
if (ast_write(chan, &fr) < 0) {
ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
Modified: team/mvanbaak/ast_frame_dataunion/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_zapscan.c?view=diff&rev=117246&r1=117245&r2=117246
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_zapscan.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_zapscan.c Mon May 19 16:40:19 2008
@@ -231,7 +231,7 @@
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) {
/* Carefully write */
- careful_write(fd, f->data, f->datalen);
+ careful_write(fd, f->data.ptr, f->datalen);
} else {
ast_log(LOG_WARNING, "Huh? Got a non-ulaw (%d) frame in the conference\n", f->subclass);
}
@@ -246,7 +246,7 @@
fr.subclass = AST_FORMAT_ULAW;
fr.datalen = res;
fr.samples = res;
- fr.data = buf;
+ fr.data.ptr = buf;
fr.offset = AST_FRIENDLY_OFFSET;
if (ast_write(chan, &fr) < 0) {
ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
More information about the asterisk-commits
mailing list