res/res_agi: Make Verbose message for 'stream file' match other playbacks
authorMatthew Jordan <mjordan@digium.com>
Fri, 12 Dec 2014 22:54:02 +0000 (22:54 +0000)
committerMatthew Jordan <mjordan@digium.com>
Fri, 12 Dec 2014 22:54:02 +0000 (22:54 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429520 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_agi.c

index 1b65048..921eeff 100644 (file)
@@ -2210,8 +2210,9 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, const
        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);