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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2012-08-29 21:15:24 +00:00
parent 7a6393d8de
commit a4d3cb86d8

View File

@@ -1147,6 +1147,13 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu
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 @@ static int conf_exec(struct ast_channel *chan, const char *data)
/* 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 @@ static int conf_exec(struct ast_channel *chan, const char *data)
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) {