[svn-commits] mjordan: branch 1.8 r421059 - /branches/1.8/main/file.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Aug 14 15:46:29 2014
New Revision: 421059

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421059
Log:
main/file: Move test event to emit PLAYBACK event more consistently

This is being done in advance of the test for ASTERISK-23953

Modified:
    branches/1.8/main/file.c

Modified: branches/1.8/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/file.c?view=diff&rev=421059&r1=421058&r2=421059
==============================================================================
--- branches/1.8/main/file.c (original)
+++ branches/1.8/main/file.c Thu Aug 14 15:46:29 2014
@@ -985,6 +985,7 @@
 		return -1;
 	if (vfs && ast_applystream(chan, vfs))
 		return -1;
+	ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", filename, chan->name);
 	res = ast_playstream(fs);
 	if (!res && vfs)
 		res = ast_playstream(vfs);
@@ -1370,7 +1371,6 @@
 {
 	int res = 0;
 	if (!ast_strlen_zero(file)) {
-		ast_test_suite_event_notify("PLAYBACK", "Message: %s", file);
 		res = ast_streamfile(chan, file, chan->language);
 		if (!res) {
 			res = ast_waitstream(chan, digits);