kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert commit that included extranous changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@182807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-03-18 01:51:21 +00:00
parent b8afcedc10
commit 59f867a5cb
33 changed files with 244 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_meetme.c
View File

@@ -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);