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 --- res/res_adsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'res/res_adsi.c') diff --git a/res/res_adsi.c b/res/res_adsi.c index 2df5324aa..39a6cec42 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -134,7 +134,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l *remainder = *remainder - amt; outf.frametype = AST_FRAME_VOICE; outf.subclass = AST_FORMAT_ULAW; - outf.data = buf; + outf.data.ptr = buf; outf.datalen = amt; outf.samples = amt; if (ast_write(chan, &outf)) { @@ -174,7 +174,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l *remainder = inf->datalen - amt; outf.frametype = AST_FRAME_VOICE; outf.subclass = AST_FORMAT_ULAW; - outf.data = buf; + outf.data.ptr = buf; outf.datalen = amt; outf.samples = amt; if (ast_write(chan, &outf)) { -- cgit v1.2.3