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

Revert meetme work around now that zaptel is fixed

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-02-10 06:47:42 +00:00
parent 077975cba7
commit 260072954e
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_meetme.c
View File

@@ -482,19 +482,6 @@ zapretry:
} }
} }
#ifndef NO_ZAPTEL_PANIC_WORKAROUND
/* 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");
}
usleep(1);
if (fd != chan->fds[0])
close(fd);
#else
if (fd != chan->fds[0]) if (fd != chan->fds[0])
close(fd); close(fd);
else { else {
@@ -507,7 +494,6 @@ zapretry:
ast_log(LOG_WARNING, "Error setting conference\n"); ast_log(LOG_WARNING, "Error setting conference\n");
} }
} }
#endif
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
conf_play(conf, LEAVE); conf_play(conf, LEAVE);