[asterisk-commits] file: trunk r55958 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Feb 21 14:41:53 2007
New Revision: 55958

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55958
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=55958&r1=55957&r2=55958
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Feb 21 14:41:53 2007
@@ -1987,7 +1987,7 @@
 						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 @@
 						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