aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-02-10 06:47:42 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-02-10 06:47:42 +0000
commit475376fe95c8b21870777d4b5bc685a30f22ba0b (patch)
tree81ba744c50482440d5eb219806611f453c3a3f98
parent8d04371ed9164aae00311e9afb25c9d20815cc00 (diff)
Revert meetme work around now that zaptel is fixed
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2146 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xapps/app_meetme.c14
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);