[Asterisk-cvs] asterisk/channels chan_oss.c,1.22,1.23

[markster at lists.digium.com]

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

Modified Files:
	chan_oss.c 
Log Message:
fix chan_oss for revised queue structure.


Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- chan_oss.c	4 Mar 2004 01:11:25 -0000	1.22
+++ chan_oss.c	7 Apr 2004 15:59:14 -0000	1.23
@@ -458,13 +458,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 {
 		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);
 		write(sndcmd[1], &res, sizeof(res));
 	}
 	return 0;
@@ -806,7 +806,7 @@
 	}
 	hookstate = 1;
 	cursound = -1;
-	ast_queue_frame(oss.owner, &f, 1);
+	ast_queue_frame(oss.owner, &f);
 	answer_sound();
 	return RESULT_SUCCESS;
 }
@@ -838,7 +838,7 @@
 		f.subclass = 0;
 		f.data = text2send;
 		f.datalen = strlen(text2send);
-		ast_queue_frame(oss.owner, &f, 1);
+		ast_queue_frame(oss.owner, &f);
 	}
 	return RESULT_SUCCESS;
 }
@@ -858,7 +858,7 @@
 	}
 	hookstate = 0;
 	if (oss.owner) {
-		ast_queue_hangup(oss.owner, 1);
+		ast_queue_hangup(oss.owner);
 	}
 	return RESULT_SUCCESS;
 }
@@ -880,7 +880,7 @@
 		if (argc == 2) {
 			for (x=0;x<strlen(argv[1]);x++) {
 				f.subclass = argv[1][x];
-				ast_queue_frame(oss.owner, &f, 1);
+				ast_queue_frame(oss.owner, &f);
 			}
 		} else {
 			ast_cli(fd, "You're already in a call.  You can use this only to dial digits until you hangup\n");
@@ -932,7 +932,7 @@
 		if (ast_exists_extension(oss.owner->bridge, context, tmp, 1, oss.owner->bridge->callerid)) {
 			ast_cli(fd, "Whee, transferring %s to %s@%s.\n", 
 					oss.owner->bridge->name, tmp, context);
-			if (ast_async_goto(oss.owner->bridge, context, tmp, 1, 1))
+			if (ast_async_goto(oss.owner->bridge, context, tmp, 1))
 				ast_cli(fd, "Failed to transfer :(\n");
 		} else {
 			ast_cli(fd, "No such extension exists\n");