[asterisk-commits] jrose: trunk r371922 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Wed Aug 29 16:15:24 2012
New Revision: 371922

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371922
Log:
app_meetme: Adding test events for following activity in MeetMe.
........

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

Merged revisions 371920 from http://svn.asterisk.org/svn/asterisk/branches/10
........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=371922&r1=371921&r2=371922
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Aug 29 16:15:24 2012
@@ -1147,6 +1147,13 @@
 	int len;
 	int res = -1;
 
+	ast_test_suite_event_notify("CONFPLAY", "Channel: %s\r\n"
+									"Conference: %s\r\n"
+									"Marked: %d",
+									chan->name,
+									conf->confno,
+									conf->markedusers);
+
 	if (!ast_check_hangup(chan))
 		res = ast_autoservice_start(chan);
 
@@ -4517,6 +4524,7 @@
 			/* Not found? */
 			if (ast_strlen_zero(confno)) {
 				res = ast_streamfile(chan, "conf-noempty", ast_channel_language(chan));
+				ast_test_suite_event_notify("PLAYBACK", "Message: conf-noempty");
 				if (!res)
 					ast_waitstream(chan, "");
 			} else {
@@ -4597,6 +4605,9 @@
 							res = 0;
 						} else {
 							/* Prompt user for pin if pin is required */
+							ast_test_suite_event_notify("PLAYBACK", "Message: conf-getpin\r\n"
+								"Channel: %s",
+								chan->name);
 							res = ast_app_getdata(chan, "conf-getpin", pin + strlen(pin), sizeof(pin) - 1 - strlen(pin), 0);
 						}
 						if (res >= 0) {