diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:41:53 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:41:53 +0000 |
commit | 5eb99b2f002021e07bc8fe1fae82942fde5b650a (patch) | |
tree | 0faf2e54bd366a6d9ec2bb31cb9f8581634ac62a /apps | |
parent | 5f936e6d21b66a586e9278b39d62806182e283d6 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@55958 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 5cdad064e..82d576dc1 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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 |