diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 01:51:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 01:51:21 +0000 |
commit | d3323c9c37e93007eae9df8b25a174fc9cbcbbfa (patch) | |
tree | 44c03bd656930ad4b36b921854685fd0ab516452 /apps/app_meetme.c | |
parent | e9def2b3fb87a25a2fdbed138f1a5331ff1b08d9 (diff) |
revert commit that included extranous changes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@182807 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r-- | apps/app_meetme.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a314a79f0..67c851a2c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2338,19 +2338,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } if (conf->transframe[index]) { - if ((conf->transframe[index]->frametype != AST_FRAME_NULL) && - can_write(chan, confflags)) { - struct ast_frame *cur; - - /* the translator may have returned a list of frames, so - write each one onto the channel - */ - for (cur = conf->transframe[index]; cur; cur = AST_LIST_NEXT(cur, frame_list)) { - if (ast_write(chan, cur)) { - ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name); - break; - } - } + if (conf->transframe[index]->frametype != AST_FRAME_NULL) { + if (can_write(chan, confflags) && ast_write(chan, conf->transframe[index])) + ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name); } } else { ast_mutex_unlock(&conf->listenlock); |