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

markster at lists.digium.com markster at lists.digium.com
Wed Apr 7 12:46:00 CDT 2004


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

Modified Files:
	chan_alsa.c 
Log Message:
First pass at fixing chan_alsa


Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- chan_alsa.c	4 Apr 2004 17:21:03 -0000	1.14
+++ chan_alsa.c	7 Apr 2004 16:46:39 -0000	1.15
@@ -212,7 +212,7 @@
 		fr->data = readbuf;
 		fr->offset = AST_FRIENDLY_OFFSET;
 
-		if (driver->owner) ast_queue_frame(driver->owner, fr, 0);
+		if (driver->owner) ast_queue_frame(driver->owner, fr);
 	}
 	return 0; /* 0 = OK, !=0 -> Error */
 }
@@ -486,13 +486,13 @@
 		ast_verbose( " << Auto-answered >> \n" );
                 f.frametype = AST_FRAME_CONTROL;
                 f.subclass = AST_CONTROL_ANSWER;
-                ast_queue_frame(c, &f, 0);
+                ast_queue_frame(c, &f);
 	} else {
                 driver->nosound = 1;
 		ast_verbose( " << Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
                 f.frametype = AST_FRAME_CONTROL;
                 f.subclass = AST_CONTROL_RINGING;
-                ast_queue_frame(c, &f, 0);
+                ast_queue_frame(c, &f);
 		driver->cursound = res;
 	}
 	return 0;
@@ -879,7 +879,7 @@
 		return RESULT_FAILURE;
 	}
 	hookstate = 1;
-	ast_queue_frame(alsa.owner, &f, 1);
+	ast_queue_frame(alsa.owner, &f);
 	answer_sound(&alsa);
 	return RESULT_SUCCESS;
 }
@@ -910,7 +910,7 @@
                 f.subclass = 0;
                 f.data = text2send;
                 f.datalen = strlen(text2send);
-                ast_queue_frame(alsa.owner, &f, 1);
+                ast_queue_frame(alsa.owner, &f);
         }
 	return RESULT_SUCCESS;
 }
@@ -931,7 +931,7 @@
 	}
 	hookstate = 0;
 	if (alsa.owner) {
-		ast_queue_hangup(alsa.owner, 1);
+		ast_queue_hangup(alsa.owner);
 	}
 	return RESULT_SUCCESS;
 }
@@ -954,7 +954,7 @@
 		if (argc == 2) {
 			for (x=0;x<strlen(argv[1]);x++) {
                                 f.subclass = argv[1][x];
-                                ast_queue_frame(alsa.owner, &f, 1);
+                                ast_queue_frame(alsa.owner, &f);
                         }
 		} else {
 			ast_cli(fd, "You're already in a call.  You can use this only to dial digits until you hangup\n");




More information about the svn-commits mailing list