kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-16 09:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@421063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-08-14 20:59:15 +00:00
parent 0b11c48522
commit 513981c89d
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/app.c
View File

@@ -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)

2
main/file.c
View File

@@ -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);