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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4e86a268ab8f0b876ef351b030cb681803a3055e..b7d488ad0bdc49cae4fc2593908a2f8de3fab1d1 100755 (executable)
--- 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);