Author: mjordan Date: Thu Aug 14 15:59:15 2014 New Revision: 421063 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421063 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 ........ Merged revisions 421061 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 421062 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/main/app.c trunk/main/file.c Propchange: trunk/ ------------------------------------------------------------------------------ --- branch-13-merged (original) +++ branch-13-merged Thu Aug 14 15:59:15 2014 @@ -1,1 +1,1 @@ -/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808,420837,420856,420879,420881,420899,420919,420940,420950,420957,420992,421010,421042 +/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808,420837,420856,420879,420881,420899,420919,420940,420950,420957,420992,421010,421042,421062 Modified: trunk/main/app.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=421063&r1=421062&r2=421063 ============================================================================== --- trunk/main/app.c (original) +++ trunk/main/app.c Thu Aug 14 15:59:15 2014 @@ -257,7 +257,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: trunk/main/file.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=421063&r1=421062&r2=421063 ============================================================================== --- trunk/main/file.c (original) +++ trunk/main/file.c Thu Aug 14 15:59:15 2014 @@ -1122,6 +1122,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); @@ -1628,7 +1629,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
