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 /res/res_adsi.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 'res/res_adsi.c')
| -rw-r--r-- | res/res_adsi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c index 4d2aaaa8f..32f168850 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -133,7 +133,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l else *remain = *remain - amt; outf.frametype = AST_FRAME_VOICE; - outf.subclass = AST_FORMAT_ULAW; + outf.subclass.codec = AST_FORMAT_ULAW; outf.data.ptr = buf; outf.datalen = amt; outf.samples = amt; @@ -162,7 +162,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l continue; } - if (inf->subclass != AST_FORMAT_ULAW) { + if (inf->subclass.codec != AST_FORMAT_ULAW) { ast_log(LOG_WARNING, "Channel not in ulaw?\n"); ast_frfree(inf); return -1; @@ -173,7 +173,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l else if (remain) *remain = inf->datalen - amt; outf.frametype = AST_FRAME_VOICE; - outf.subclass = AST_FORMAT_ULAW; + outf.subclass.codec = AST_FORMAT_ULAW; outf.data.ptr = buf; outf.datalen = amt; outf.samples = amt; @@ -230,16 +230,16 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms return -1; } if (f->frametype == AST_FRAME_DTMF) { - if (f->subclass == 'A') { + if (f->subclass.integer == 'A') { /* Okay, this is an ADSI CPE. Note this for future reference, too */ if (!chan->adsicpe) chan->adsicpe = AST_ADSI_AVAILABLE; break; } else { - if (f->subclass == 'D') + if (f->subclass.integer == 'D') ast_debug(1, "Off-hook capable CPE only, not ADSI\n"); else - ast_log(LOG_WARNING, "Unknown ADSI response '%c'\n", f->subclass); + ast_log(LOG_WARNING, "Unknown ADSI response '%c'\n", f->subclass.integer); if (!chan->adsicpe) chan->adsicpe = AST_ADSI_UNAVAILABLE; errno = ENOSYS; |