[asterisk-commits] mjordan: branch certified-13.1 r430094 - in /certified/branches/13.1: ./ res/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Dec 24 09:27:53 2014
New Revision: 430094

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430094
Log:
res/res_agi: Make Verbose message for 'stream file' match other playbacks

The Verbose message displayed when a file is played back via 'stream file'
was formatted differently than other playbacks:
* It didn't include the channel name
* It didn't include the channel language
It does, however, include the playback offset as well as any escape digits.
That information was kept; however, this patch updates the formatting to more
closely match the Verbose messages displayed when a file is played back by
'control stream file', Playback, ControlPlayback, or any other file playback
operation.
........

Merged revisions 429519 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    certified/branches/13.1/   (props changed)
    certified/branches/13.1/res/res_agi.c

Propchange: certified/branches/13.1/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Wed Dec 24 09:27:53 2014
@@ -1,1 +1,1 @@
-/branches/13:429128-429222,429224-429246,429352,429407,429409,429433,429477,429497,429540,429571,429739,429741,429761,429829,430010,430034,430083-430084,430092
+/branches/13:429128-429222,429224-429246,429352,429407,429409,429433,429477,429497,429519,429540,429571,429739,429741,429761,429829,430010,430034,430083-430084,430092

Modified: certified/branches/13.1/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_agi.c?view=diff&rev=430094&r1=430093&r2=430094
==============================================================================
--- certified/branches/13.1/res/res_agi.c (original)
+++ certified/branches/13.1/res/res_agi.c Wed Dec 24 09:27:53 2014
@@ -2210,8 +2210,9 @@
 	if ((vfs = ast_openvstream(chan, argv[2], ast_channel_language(chan)))) {
 		ast_debug(1, "Ooh, found a video stream, too\n");
 	}
-
-	ast_verb(3, "Playing '%s' (escape_digits=%s) (sample_offset %ld)\n", argv[2], edigits, sample_offset);
+	ast_verb(3, "<%s> Playing '%s.%s' (escape_digits=%s) (sample_offset %ld) (language '%s')\n",
+		ast_channel_name(chan), argv[2], ast_format_get_name(ast_channel_writeformat(chan)),
+		edigits, sample_offset, S_OR(ast_channel_language(chan), "default"));
 
 	ast_seekstream(fs, 0, SEEK_END);
 	max_length = ast_tellstream(fs);