diff options
author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
---|---|---|
committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
commit | c1210321e7aeb274076b14fc2f622edf442246fa (patch) | |
tree | bcbbf4eda53cdb8257bbc7add4616e01e31b1ae2 /formats/format_wav.c | |
parent | 2d9ba021dd38039616c82a4e317f652abe246ba3 (diff) |
- 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
Diffstat (limited to 'formats/format_wav.c')
-rw-r--r-- | formats/format_wav.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c index bbeb20baf..5cf39ce99 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -362,7 +362,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, bytes); - if ( (res = fread(s->fr.data, 1, s->fr.datalen, s->f)) <= 0 ) { + if ( (res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) <= 0 ) { if (res) ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); return NULL; @@ -370,7 +370,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) s->fr.datalen = res; s->fr.samples = samples = res / 2; - tmp = (short *)(s->fr.data); + tmp = (short *)(s->fr.data.ptr); #if __BYTE_ORDER == __BIG_ENDIAN /* file format is little endian so we need to swap */ for( x = 0; x < samples; x++) @@ -407,14 +407,14 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Data length is too long\n"); return -1; } - tmpi = f->data; + tmpi = f->data.ptr; for (x=0; x < f->datalen/2; x++) tmp[x] = (tmpi[x] << 8) | ((tmpi[x] & 0xff00) >> 8); if ((res = fwrite(tmp, 1, f->datalen, fs->f)) != f->datalen ) { #else /* just write */ - if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen ) { + if ((res = fwrite(f->data.ptr, 1, f->datalen, fs->f)) != f->datalen ) { #endif ast_log(LOG_WARNING, "Bad write (%d): %s\n", res, strerror(errno)); return -1; |