Merged revisions 55957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r55957 | file | 2007-02-21 15:35:40 -0500 (Wed, 21 Feb 2007) | 10 lines Merged revisions 55956 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r55956 | file | 2007-02-21 15:32:16 -0500 (Wed, 21 Feb 2007) | 2 lines Change naughty warning message to provide useful information. If a write now fails on a channel in meetme it will tell you the channel name instead of spitting out the wrong error message. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
28a6129af8
commit
7e06a97fdd
|
@ -1987,7 +1987,7 @@ 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) {
|
||||
if (ast_write(chan, conf->transframe[index]))
|
||||
ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
|
||||
ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
|
||||
}
|
||||
} else {
|
||||
ast_mutex_unlock(&conf->listenlock);
|
||||
|
@ -1999,7 +1999,7 @@ bailoutandtrynormal:
|
|||
if (user->listen.actual)
|
||||
ast_frame_adjust_volume(&fr, user->listen.actual);
|
||||
if (ast_write(chan, &fr) < 0) {
|
||||
ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
|
||||
ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
|
||||
}
|
||||
}
|
||||
} else
|
||||
|
|
Loading…
Reference in New Issue