[Asterisk-cvs] asterisk/include/asterisk channel.h,1.41,1.42 channel_pvt.h,1.13,1.14 dsp.h,1.2,1.3 pbx.h,1.23,1.24

[markster at lists.digium.com]

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

Modified Files:
	channel.h channel_pvt.h dsp.h pbx.h 
Log Message:
Get rid of all that old needlock garbage now that we're using recursive mutexes


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- channel.h	27 Mar 2004 06:50:12 -0000	1.41
+++ channel.h	6 Apr 2004 22:17:32 -0000	1.42
@@ -572,7 +572,7 @@
  * Set read format for channel to whichever component of "format" is best. 
  * Returns 0 on success, -1 on failure
  */
-int ast_set_read_format(struct ast_channel *chan, int format, int needlock);
+int ast_set_read_format(struct ast_channel *chan, int format);
 
 //! Sets write format on channel chan
 /*! 
@@ -581,7 +581,7 @@
  * Set write format for channel to whichever compoent of "format" is best. 
  * Returns 0 on success, -1 on failure
  */
-int ast_set_write_format(struct ast_channel *chan, int format, int needlock);
+int ast_set_write_format(struct ast_channel *chan, int format);
 
 //! Sends text to a channel
 /*! 
@@ -777,7 +777,7 @@
    and 1 if supported and requested */
 int ast_transfer(struct ast_channel *chan, char *dest);
 
-int ast_do_masquerade(struct ast_channel *chan, int grablock);
+int ast_do_masquerade(struct ast_channel *chan);
 
 /* Misc. functions below */
 

Index: channel_pvt.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel_pvt.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- channel_pvt.h	4 Mar 2004 01:11:25 -0000	1.13
+++ channel_pvt.h	6 Apr 2004 22:17:32 -0000	1.14
@@ -60,7 +60,7 @@
 	/*! Indicate a particular condition (e.g. AST_CONTROL_BUSY or AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */
 	int (*indicate)(struct ast_channel *c, int condition);
 	/*! Fix up a channel:  If a channel is consumed, this is called.  Basically update any ->owner links */
-	int (*fixup)(struct ast_channel *oldchan, struct ast_channel *newchan, int lock);
+	int (*fixup)(struct ast_channel *oldchan, struct ast_channel *newchan);
 	/*! Set a given option */
 	int (*setoption)(struct ast_channel *chan, int option, void *data, int datalen);
 	/*! Query a given option */
@@ -75,12 +75,12 @@
 /*! Returns NULL on failure to allocate */
 struct ast_channel *ast_channel_alloc(int needalertpipe);
 
-/*! Queue an outgoing frame, locking if necessary */
-int ast_queue_frame(struct ast_channel *chan, struct ast_frame *f, int lock);
+/*! Queue an outgoing frame */
+int ast_queue_frame(struct ast_channel *chan, struct ast_frame *f);
 
-int ast_queue_hangup(struct ast_channel *chan, int lock);
+int ast_queue_hangup(struct ast_channel *chan);
 
-int ast_queue_control(struct ast_channel *chan, int control, int lock);
+int ast_queue_control(struct ast_channel *chan, int control);
 
 /*! Change the state of a channel */
 int ast_setstate(struct ast_channel *chan, int state);

Index: dsp.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/dsp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dsp.h	28 Mar 2004 02:53:04 -0000	1.2
+++ dsp.h	6 Apr 2004 22:17:32 -0000	1.3
@@ -45,7 +45,7 @@
 
 /* Return AST_FRAME_NULL frames when there is silence, AST_FRAME_BUSY on 
    busies, and call progress, all dependent upon which features are enabled */
-struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, struct ast_frame *inf, int needlock);
+struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, struct ast_frame *inf);
 
 /* Return non-zero if this is silence.  Updates "totalsilence" with the total
    number of seconds of silence  */

Index: pbx.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/pbx.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- pbx.h	25 Oct 2003 17:50:06 -0000	1.23
+++ pbx.h	6 Apr 2004 22:17:32 -0000	1.24
@@ -481,7 +481,7 @@
 int ast_unlock_context(struct ast_context *con);
 
 
-int ast_async_goto(struct ast_channel *chan, char *context, char *exten, int priority, int needlock);
+int ast_async_goto(struct ast_channel *chan, char *context, char *exten, int priority);
 
 int ast_async_goto_by_name(char *chan, char *context, char *exten, int priority);