From c1210321e7aeb274076b14fc2f622edf442246fa Mon Sep 17 00:00:00 2001 From: mvanbaak Date: Thu, 22 May 2008 16:29:54 +0000 Subject: - revert change to ast_queue_hangup and create ast_queue_hangup_with_cause - make data member of the ast_frame struct a named union instead of a void Recently the ast_queue_hangup function got a new parameter, the hangupcause Feedback came in that this is no good and that instead a new function should be created. This I did. The hangupcause was stored in the seqno member of the ast_frame struct. This is not very elegant, and since there's already a data member that one should be used. Problem is, this member was a void *. Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone wants to store another type in there in the future. This commit is so massive, because all ast_frame.data uses have to be altered to ast_frame.data.data Thanks russellb and kpfleming for the feedback. (closes issue #12674) Reported by: mvanbaak git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ff52323aa..08e2fb56e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2342,7 +2342,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c 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 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c 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) || -- cgit v1.2.3