[Asterisk-cvs] asterisk/channels chan_alsa.c,1.16,1.17

[markster at lists.digium.com]

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

Modified Files:
	chan_alsa.c 
Log Message:
Revert earlier jcdutton ALSA improvements which are not disclaimed


Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_alsa.c	8 Apr 2004 19:19:24 -0000	1.16
+++ chan_alsa.c	11 Apr 2004 01:59:11 -0000	1.17
@@ -36,6 +36,10 @@
 #include "ring10.h"
 #include "answer.h"
 
+#ifdef ALSA_MONITOR
+#include "alsa-monitor.h"
+#endif
+
 #define DEBUG 0
 /* Which device to use */
 #define ALSA_INDEV "default"
@@ -43,21 +47,33 @@
[...1044 lines suppressed...]
@@ -1072,6 +1091,8 @@
 	int x;
 	for (x=0;x<sizeof(myclis)/sizeof(struct ast_cli_entry); x++)
 		ast_cli_unregister(myclis + x);
+	close(readdev);
+	close(writedev);
 	if (cmd[0] > 0) {
 		close(cmd[0]);
 		close(cmd[1]);
@@ -1084,10 +1105,6 @@
 		ast_softhangup(alsa.owner, AST_SOFTHANGUP_APPUNLOAD);
 	if (alsa.owner)
 		return -1;
-	if (alsa.capture_buf) {
-		free (alsa.capture_buf);
-		alsa.capture_buf=0;
-	}
 	return 0;
 }