diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-11-04 14:05:12 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-11-04 14:05:12 +0000 |
| commit | d8e0c584372c51b585a52efbe2375861bc09bdcf (patch) | |
| tree | dd3bc244b8a45aacb932109dc8c12d1f21769d55 /formats/format_vox.c | |
| parent | 6a50e7a031f4d424aa8bd3293aa48501f7b96652 (diff) | |
Expand codec bitfield from 32 bits to 64 bits.
Reviewboard: https://reviewboard.asterisk.org/r/416/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@227580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats/format_vox.c')
| -rw-r--r-- | formats/format_vox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/formats/format_vox.c b/formats/format_vox.c index a9aef6070..546777752 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -41,7 +41,7 @@ static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext) /* Send a frame from the file to the appropriate channel */ s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_ADPCM; + s->fr.subclass.codec = AST_FORMAT_ADPCM; s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { @@ -61,8 +61,8 @@ static int vox_write(struct ast_filestream *s, struct ast_frame *f) ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); return -1; } - if (f->subclass != AST_FORMAT_ADPCM) { - ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%d)!\n", f->subclass); + if (f->subclass.codec != AST_FORMAT_ADPCM) { + ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%s)!\n", ast_getformatname(f->subclass.codec)); return -1; } if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) { |