From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 14 Aug 2014 20:57:48 +0000 (+0000)
Subject: main/file: Move test event to emit PLAYBACK event more consistently
X-Git-Tag: 12.6.0-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6f65f0d5dc0df475b9b6ec8991f940759184a94;p=thirdparty%2Fasterisk.git

main/file: Move test event to emit PLAYBACK event more consistently

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

Merged revisions 421059 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 421060 from http://svn.asterisk.org/svn/asterisk/branches/11


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

diff --git a/main/app.c b/main/app.c
index 3c2f33c51f..cc9633f75a 100644
--- a/main/app.c
+++ b/main/app.c
@@ -256,7 +256,6 @@ enum ast_getdata_result ast_app_getdata(struct ast_channel *c, const char *promp
 
 	filename = ast_strdupa(prompt);
 	while ((front = strsep(&filename, "&"))) {
-		ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", front, ast_channel_name(c));
 		if (!ast_strlen_zero(front)) {
 			res = ast_streamfile(c, front, ast_channel_language(c));
 			if (res)
diff --git a/main/file.c b/main/file.c
index df67fbf433..f4018d5373 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1105,6 +1105,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p
 		return -1;
 	if (vfs && ast_applystream(chan, vfs))
 		return -1;
+	ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", filename, ast_channel_name(chan));
 	res = ast_playstream(fs);
 	if (!res && vfs)
 		res = ast_playstream(vfs);
@@ -1611,7 +1612,6 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char *
 {
 	int res = 0;
 	if (!ast_strlen_zero(file)) {
-		ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", file, ast_channel_name(chan));
 		res = ast_streamfile(chan, file, ast_channel_language(chan));
 		if (!res) {
 			res = ast_waitstream(chan, digits);