From 13bca43aa8d950e7db8c301a2718a2fe290c401a Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 6 Apr 2004 22:17:32 +0000 Subject: Get rid of all that old needlock garbage now that we're using recursive mutexes git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2644 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/channel.h | 6 +++--- include/asterisk/channel_pvt.h | 10 +++++----- include/asterisk/dsp.h | 2 +- include/asterisk/pbx.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index dea3708fa..aea8cbc1d 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -572,7 +572,7 @@ int ast_prod(struct ast_channel *chan); * 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 @@ int ast_set_read_format(struct ast_channel *chan, int format, int needlock); * 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 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), 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 */ diff --git a/include/asterisk/channel_pvt.h b/include/asterisk/channel_pvt.h index 9de87541b..97a48f902 100755 --- a/include/asterisk/channel_pvt.h +++ b/include/asterisk/channel_pvt.h @@ -60,7 +60,7 @@ struct ast_channel_pvt { /*! 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 @@ struct ast_channel_pvt { /*! 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); diff --git a/include/asterisk/dsp.h b/include/asterisk/dsp.h index e3624a33f..2f28c5d6e 100755 --- a/include/asterisk/dsp.h +++ b/include/asterisk/dsp.h @@ -45,7 +45,7 @@ int ast_dsp_set_call_progress_zone(struct ast_dsp *dsp, char *zone); /* 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 */ diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 9beb5667a..ba7507a8d 100755 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -481,7 +481,7 @@ int ast_lock_context(struct ast_context *con); 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); -- cgit v1.2.3