From d8e0c584372c51b585a52efbe2375861bc09bdcf Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 4 Nov 2009 14:05:12 +0000 Subject: 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 --- formats/format_wav.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'formats/format_wav.c') diff --git a/formats/format_wav.c b/formats/format_wav.c index b458442e2..ab02a5d15 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -361,7 +361,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) bytes = 0; /* ast_debug(1, "here: %d, maxlen: %d, bytes: %d\n", here, s->maxlen, bytes); */ s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_SLINEAR; + s->fr.subclass.codec = AST_FORMAT_SLINEAR; s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, bytes); @@ -397,8 +397,8 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); return -1; } - if (f->subclass != AST_FORMAT_SLINEAR) { - ast_log(LOG_WARNING, "Asked to write non-SLINEAR frame (%d)!\n", f->subclass); + if (f->subclass.codec != AST_FORMAT_SLINEAR) { + ast_log(LOG_WARNING, "Asked to write non-SLINEAR frame (%s)!\n", ast_getformatname(f->subclass.codec)); return -1; } if (!f->datalen) -- cgit v1.2.3