[svn-commits] jrose: branch certified-1.8.11 r371941 - in /certified/branches/1.8.11: ./ apps/

[SVN commits to the Digium repositories]

Author: jrose
Date: Wed Aug 29 16:23:05 2012
New Revision: 371941

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

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


Modified:
    certified/branches/1.8.11/   (props changed)
    certified/branches/1.8.11/apps/app_meetme.c

Propchange: certified/branches/1.8.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 29 16:23:05 2012
@@ -1,1 +1,1 @@
-/branches/1.8:357665,358162,359656,359706,359979,360086,360884,367781,367843,368604,368759
+/branches/1.8:357665,358162,359656,359706,359979,360086,360884,367781,367843,368604,368759,371919

Modified: certified/branches/1.8.11/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/1.8.11/apps/app_meetme.c?view=diff&rev=371941&r1=371940&r2=371941
==============================================================================
--- certified/branches/1.8.11/apps/app_meetme.c (original)
+++ certified/branches/1.8.11/apps/app_meetme.c Wed Aug 29 16:23:05 2012
@@ -1113,6 +1113,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);
 
@@ -4296,6 +4303,7 @@
 
 			/* Not found? */
 			if (ast_strlen_zero(confno)) {
+				ast_test_suite_event_notify("PLAYBACK", "Message: conf-noempty");
 				res = ast_streamfile(chan, "conf-noempty", chan->language);
 				if (!res)
 					ast_waitstream(chan, "");
@@ -4377,6 +4385,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) {