kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 00:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Begin autoservice while playing enter/leave sounds (bug #3599)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-16 03:50:41 +00:00
parent b0863c5e31
commit 2127cf3c7b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_meetme.c
View File

@@ -216,10 +216,13 @@ static int careful_write(int fd, unsigned char *data, int len)
return 0;
}
static void conf_play(struct ast_conference *conf, int sound)
static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int sound)
{
unsigned char *data;
int len;
int res=-1;
if (!chan->_softhangup)
res = ast_autoservice_start(chan);
ast_mutex_lock(&conflock);
switch(sound) {
case ENTER:
@@ -237,6 +240,8 @@ static void conf_play(struct ast_conference *conf, int sound)
if (data)
careful_write(conf->fd, data, len);
ast_mutex_unlock(&conflock);
if (!res)
ast_autoservice_stop(chan);
}
static struct ast_conference *build_conf(char *confno, char *pin, int make, int dynamic)
@@ -789,7 +794,7 @@ zapretry:
if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) {
firstpass = 1;
if (!(confflags & CONFFLAG_QUIET))
conf_play(conf, ENTER);
conf_play(chan, conf, ENTER);
}
ast_mutex_unlock(&conflock);
if (confflags & CONFFLAG_AGI) {
@@ -1105,7 +1110,7 @@ zapretry:
ast_mutex_lock(&conflock);
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
conf_play(conf, LEAVE);
conf_play(chan, conf, LEAVE);
if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
if (ast_fileexists(user->namerecloc, NULL, NULL)) {