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 --- apps/app_dahdibarge.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/app_dahdibarge.c') diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c index 424ba3609..d9dd59054 100644 --- a/apps/app_dahdibarge.c +++ b/apps/app_dahdibarge.c @@ -208,17 +208,17 @@ dahdiretry: f = ast_read(c); if (!f) break; - if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) { + if ((f->frametype == AST_FRAME_DTMF) && (f->subclass.integer == '#')) { ret = 0; ast_frfree(f); break; } else if (fd != chan->fds[0]) { if (f->frametype == AST_FRAME_VOICE) { - if (f->subclass == AST_FORMAT_ULAW) { + if (f->subclass.codec == AST_FORMAT_ULAW) { /* Carefully write */ careful_write(fd, f->data.ptr, f->datalen); } else - ast_log(LOG_WARNING, "Huh? Got a non-ulaw (%d) frame in the conference\n", f->subclass); + ast_log(LOG_WARNING, "Huh? Got a non-ulaw (%s) frame in the conference\n", ast_getformatname(f->subclass.codec)); } } ast_frfree(f); @@ -227,7 +227,7 @@ dahdiretry: if (res > 0) { memset(&fr, 0, sizeof(fr)); fr.frametype = AST_FRAME_VOICE; - fr.subclass = AST_FORMAT_ULAW; + fr.subclass.codec = AST_FORMAT_ULAW; fr.datalen = res; fr.samples = res; fr.data.ptr = buf; -- cgit v1.2.3