[asterisk-commits] russell: branch russell/chan_refcount r90144 - in /team/russell/chan_refcount...

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Nov 28 18:08:33 2007
New Revision: 90144

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90144
Log:
sync with trunk

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/include/asterisk/file.h
    team/russell/chan_refcount/main/file.c

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 28 18:08:33 2007
@@ -1,1 +1,1 @@
-/trunk:1-90139
+/trunk:1-90143

Modified: team/russell/chan_refcount/include/asterisk/file.h
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/include/asterisk/file.h?view=diff&rev=90144&r1=90143&r2=90144
==============================================================================
--- team/russell/chan_refcount/include/asterisk/file.h (original)
+++ team/russell/chan_refcount/include/asterisk/file.h Wed Nov 28 18:08:33 2007
@@ -73,7 +73,7 @@
  *
  * \retval 0 always
  *
- * \note The channel should be locked before calling this function.
+ * \note The channel does not need to be locked before calling this function.
  */
 int ast_stopstream(struct ast_channel *c);
 

Modified: team/russell/chan_refcount/main/file.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/file.c?view=diff&rev=90144&r1=90143&r2=90144
==============================================================================
--- team/russell/chan_refcount/main/file.c (original)
+++ team/russell/chan_refcount/main/file.c Wed Nov 28 18:08:33 2007
@@ -119,6 +119,8 @@
 
 int ast_stopstream(struct ast_channel *tmp)
 {
+	ast_channel_lock(tmp);
+
 	/* Stop a running stream if there is one */
 	if (tmp->stream) {
 		ast_closestream(tmp->stream);
@@ -131,6 +133,9 @@
 		ast_closestream(tmp->vstream);
 		tmp->vstream = NULL;
 	}
+
+	ast_channel_unlock(tmp);
+
 	return 0;
 }