[Asterisk-cvs] asterisk/apps app_meetme.c,1.19,1.20

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv12413/apps

Modified Files:
	app_meetme.c 
Log Message:
Revert meetme work around now that zaptel is fixed


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- app_meetme.c	5 Feb 2004 22:28:44 -0000	1.19
+++ app_meetme.c	10 Feb 2004 06:47:42 -0000	1.20
@@ -482,19 +482,6 @@
 		}
 	}
 
-#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 @@
 			ast_log(LOG_WARNING, "Error setting conference\n");
 		}
 	}
-#endif
 	if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
 		conf_play(conf, LEAVE);