Author: mjordan Date: Thu Aug 14 15:57:48 2014 New Revision: 421061 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421061 Log: 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 Modified: branches/12/ (props changed) branches/12/main/app.c branches/12/main/file.c Propchange: branches/12/ ------------------------------------------------------------------------------ Binary property 'branch-11-merged' - no diff available. Modified: branches/12/main/app.c URL: http://svnview.digium.com/svn/asterisk/branches/12/main/app.c?view=diff&rev=421061&r1=421060&r2=421061 ============================================================================== --- branches/12/main/app.c (original) +++ branches/12/main/app.c Thu Aug 14 15:57:48 2014 @@ -256,7 +256,6 @@ 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) Modified: branches/12/main/file.c URL: http://svnview.digium.com/svn/asterisk/branches/12/main/file.c?view=diff&rev=421061&r1=421060&r2=421061 ============================================================================== --- branches/12/main/file.c (original) +++ branches/12/main/file.c Thu Aug 14 15:57:48 2014 @@ -1105,6 +1105,7 @@ 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 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); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
