diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-24 00:32:20 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-24 00:32:20 +0000 |
| commit | ebaf59a656ef94e19332c08e0d0562b8cbe59f65 (patch) | |
| tree | 6e75fd13924808bddacc18e14d5e02975a322481 /channels/chan_jingle.c | |
| parent | 235f88d12270b328ad466889189400666b3e56c1 (diff) | |
Opaquification for ast_format structs in struct ast_channel
Review: https://reviewboard.asterisk.org/r/1770/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index a683a4160..7156e9443 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -882,10 +882,10 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * ast_best_codec(ast_channel_nativeformats(tmp), &tmpfmt); - ast_format_copy(&tmp->writeformat, &tmpfmt); - ast_format_copy(&tmp->rawwriteformat, &tmpfmt); - ast_format_copy(&tmp->readformat, &tmpfmt); - ast_format_copy(&tmp->rawreadformat, &tmpfmt); + ast_format_copy(ast_channel_writeformat(tmp), &tmpfmt); + ast_format_copy(ast_channel_rawwriteformat(tmp), &tmpfmt); + ast_format_copy(ast_channel_readformat(tmp), &tmpfmt); + ast_format_copy(ast_channel_rawreadformat(tmp), &tmpfmt); ast_channel_tech_pvt_set(tmp, i); tmp->callgroup = client->callgroup; @@ -1233,8 +1233,8 @@ static struct ast_frame *jingle_rtp_read(struct ast_channel *ast, struct jingle_ ast_debug(1, "Oooh, format changed to %s\n", ast_getformatname(&f->subclass.format)); ast_format_cap_remove_bytype(ast_channel_nativeformats(p->owner), AST_FORMAT_TYPE_AUDIO); ast_format_cap_add(ast_channel_nativeformats(p->owner), &f->subclass.format); - ast_set_read_format(p->owner, &p->owner->readformat); - ast_set_write_format(p->owner, &p->owner->writeformat); + ast_set_read_format(p->owner, ast_channel_readformat(p->owner)); + ast_set_write_format(p->owner, ast_channel_writeformat(p->owner)); } /* if ((ast_test_flag(p, SIP_DTMF) == SIP_DTMF_INBAND) && p->vad) { f = ast_dsp_process(p->owner, p->vad, f); @@ -1271,8 +1271,8 @@ static int jingle_write(struct ast_channel *ast, struct ast_frame *frame) "Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n", ast_getformatname(&frame->subclass.format), ast_getformatname_multiple(buf, sizeof(buf), ast_channel_nativeformats(ast)), - ast_getformatname(&ast->readformat), - ast_getformatname(&ast->writeformat)); + ast_getformatname(ast_channel_readformat(ast)), + ast_getformatname(ast_channel_writeformat(ast))); return 0; } if (p) { @@ -1635,8 +1635,8 @@ static char *jingle_show_channels(struct ast_cli_entry *e, int cmd, struct ast_c ast_channel_name(chan), jid, resource, - ast_getformatname(&chan->readformat), - ast_getformatname(&chan->writeformat) + ast_getformatname(ast_channel_readformat(chan)), + ast_getformatname(ast_channel_writeformat(chan)) ); else ast_log(LOG_WARNING, "No available channel\n"); |