[Asterisk-cvs] asterisk/channels chan_alsa.c,1.13,1.14

[markster at lists.digium.com]

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

Modified Files:
	chan_alsa.c 
Log Message:
Merge changes from jcdutton (thanks!)


Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- chan_alsa.c	24 Mar 2004 21:34:21 -0000	1.13
+++ chan_alsa.c	4 Apr 2004 17:21:03 -0000	1.14
@@ -36,10 +36,6 @@
 #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"
@@ -47,33 +43,21 @@
[...1045 lines suppressed...]
@@ -1092,8 +1072,6 @@
 	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]);
@@ -1106,6 +1084,10 @@
 		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;
 }