diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-04 14:05:12 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-04 14:05:12 +0000 |
| commit | 3bacd4082e2d3a2dd5b8b13635df956aa4f415cd (patch) | |
| tree | dd3bc244b8a45aacb932109dc8c12d1f21769d55 /apps/app_dahdibarge.c | |
| parent | 1d3ce2ae5f81e30ec0704efe840bc2c9a24c7e8a (diff) | |
Expand codec bitfield from 32 bits to 64 bits.
Reviewboard: https://reviewboard.asterisk.org/r/416/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227580 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dahdibarge.c')
| -rw-r--r-- | apps/app_dahdibarge.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |