diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-08-14 20:58:54 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-08-14 20:58:54 +0000 |
| commit | fa02e06132818ad6e2134eb60a596f1bbd484de9 (patch) | |
| tree | 8d3d87fc7ddd7ddd142decf5a32da3f969a7b154 /main | |
| parent | 6e4d44c2a1ff020e66ee8ab16471b3158f63cfe5 (diff) | |
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
........
Merged revisions 421061 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/app.c | 1 | ||||
| -rw-r--r-- | main/file.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index 89889c65f..a13116bb3 100644 --- a/main/app.c +++ b/main/app.c @@ -257,7 +257,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 59d39df8f..b12883d49 100644 --- a/main/file.c +++ b/main/file.c @@ -1122,6 +1122,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); @@ -1628,7 +1629,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); |