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

Version 0.2.0 from FTP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2002-08-11 02:12:40 +00:00
parent eca3fe39be
commit 71ca1d1630
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_meetme.c
View File

@@ -337,6 +337,16 @@ zapretry:
} }
if (fd != chan->fds[0]) if (fd != chan->fds[0])
close(fd); close(fd);
else {
/* Take out of conference */
/* Add us to the conference */
ztc.chan = 0;
ztc.confno = 0;
ztc.confmode = 0;
if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference\n");
}
}
conf_play(conf, LEAVE); conf_play(conf, LEAVE);
@@ -410,7 +420,7 @@ static int count_exec(struct ast_channel *chan, void *data)
cnt = conf->users; cnt = conf->users;
else else
cnt = 0; cnt = 0;
if (chan->state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
ast_answer(chan); ast_answer(chan);
res = ast_say_number(chan, cnt, "", chan->language); res = ast_say_number(chan, cnt, "", chan->language);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
@@ -431,7 +441,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
data = ""; data = "";
} }
LOCAL_USER_ADD(u); LOCAL_USER_ADD(u);
if (chan->state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
ast_answer(chan); ast_answer(chan);
retry: retry:
/* Parse out the stuff */ /* Parse out the stuff */