diff options
| author | Mark Spencer <markster@digium.com> | 2004-02-10 06:47:42 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-02-10 06:47:42 +0000 |
| commit | 260072954e8809fce521f9e0dfa951abba67aa40 (patch) | |
| tree | 81ba744c50482440d5eb219806611f453c3a3f98 /apps/app_meetme.c | |
| parent | 077975cba75326fda0a855622d4434d61d2bbc9d (diff) | |
Revert meetme work around now that zaptel is fixed
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rwxr-xr-x | apps/app_meetme.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4e86a268a..b7d488ad0 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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]) close(fd); else { @@ -507,7 +494,6 @@ zapretry: ast_log(LOG_WARNING, "Error setting conference\n"); } } -#endif if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) conf_play(conf, LEAVE); |