From f1e9371da8b502999b9aec1db7f68635395a7b6a Mon Sep 17 00:00:00 2001 From: Michiel van Baak 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: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/codec_ulaw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'codecs/codec_ulaw.c') diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index ebd1928a2..2e0a16467 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -44,7 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { int i = f->samples; - unsigned char *src = f->data; + unsigned char *src = f->data.ptr; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples; pvt->samples += i; @@ -62,7 +62,7 @@ static int lintoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { int i = f->samples; char *dst = pvt->outbuf + pvt->samples; - int16_t *src = f->data; + int16_t *src = f->data.ptr; pvt->samples += i; pvt->datalen += i; /* 1 byte/sample */ @@ -84,7 +84,7 @@ static struct ast_frame *ulawtolin_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = ulaw_slin_ex; + f.data.ptr = ulaw_slin_ex; return &f; } @@ -103,7 +103,7 @@ static struct ast_frame *lintoulaw_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = slin_ulaw_ex; + f.data.ptr = slin_ulaw_ex; return &f; } -- cgit v1.2.3