mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-11 15:18:38 +00:00
- 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
This commit is contained in:
@@ -102,7 +102,7 @@ static int resample_frame(struct ast_trans_pvt *pvt,
|
||||
{
|
||||
int total_in_buf_used = 0;
|
||||
int total_out_buf_used = 0;
|
||||
int16_t *in_buf = (int16_t *) f->data;
|
||||
int16_t *in_buf = (int16_t *) f->data.ptr;
|
||||
int16_t *out_buf = (int16_t *) pvt->outbuf + pvt->samples;
|
||||
float in_buf_f[f->samples];
|
||||
float out_buf_f[2048];
|
||||
@@ -168,7 +168,7 @@ static struct ast_frame *slin16_to_slin8_sample(void)
|
||||
.datalen = sizeof(slin16_slin8_ex),
|
||||
.samples = sizeof(slin16_slin8_ex) / sizeof(slin16_slin8_ex[0]),
|
||||
.src = __PRETTY_FUNCTION__,
|
||||
.data = slin16_slin8_ex,
|
||||
.data.ptr = slin16_slin8_ex,
|
||||
};
|
||||
|
||||
return &f;
|
||||
@@ -182,7 +182,7 @@ static struct ast_frame *slin8_to_slin16_sample(void)
|
||||
.datalen = sizeof(slin8_slin16_ex),
|
||||
.samples = sizeof(slin8_slin16_ex) / sizeof(slin8_slin16_ex[0]),
|
||||
.src = __PRETTY_FUNCTION__,
|
||||
.data = slin8_slin16_ex,
|
||||
.data.ptr = slin8_slin16_ex,
|
||||
};
|
||||
|
||||
return &f;
|
||||
|
Reference in New Issue
Block a user