kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge a change from team/russell/chan_refcount ...

Browse Source 
This makes ast_stopstream() thread-safe.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@90142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-11-29 00:06:08 +00:00
parent c24b0e152a
commit 1380790b60
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/file.h
View File

@@ -172,11 +172,16 @@ int ast_streamfile(struct ast_channel *c, const char *filename, const char *pref
int ast_stream_and_wait(struct ast_channel *chan, const char *file, int ast_stream_and_wait(struct ast_channel *chan, const char *file,
const char *language, const char *digits); const char *language, const char *digits);
/*! Stops a stream */ /*!
/*! * \brief Stops a stream
*
* \param c The channel you wish to stop playback on * \param c The channel you wish to stop playback on
*
* Stop playback of a stream * Stop playback of a stream
* Returns 0 regardless *
* \retval 0 always
*
* \note The channel does not need to be locked before calling this function.
*/ */
int ast_stopstream(struct ast_channel *c); int ast_stopstream(struct ast_channel *c);

5
main/file.c
View File

@@ -136,6 +136,8 @@ int ast_format_unregister(const char *name)
int ast_stopstream(struct ast_channel *tmp) int ast_stopstream(struct ast_channel *tmp)
{ {
ast_channel_lock(tmp);
/* Stop a running stream if there is one */ /* Stop a running stream if there is one */
if (tmp->stream) { if (tmp->stream) {
ast_closestream(tmp->stream); ast_closestream(tmp->stream);
@@ -148,6 +150,9 @@ int ast_stopstream(struct ast_channel *tmp)
ast_closestream(tmp->vstream); ast_closestream(tmp->vstream);
tmp->vstream = NULL; tmp->vstream = NULL;
} }
ast_channel_unlock(tmp);
return 0; return 0;
} }