[asterisk-commits] tilghman: branch 1.6.2 r219669 - in /branches/1.6.2: ./ main/file.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Sep 20 13:21:15 2009
New Revision: 219669

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219669
Log:
Merged revisions 219654 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219654 | tilghman | 2009-09-20 12:55:49 -0500 (Sun, 20 Sep 2009) | 15 lines
  
  Merged revisions 219653 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219653 | tilghman | 2009-09-20 12:52:05 -0500 (Sun, 20 Sep 2009) | 8 lines
    
    Really stop the stream, when ast_closestream() is called.
    (closes issue #15129)
     Reported by: bmh
     Patches: 
           20090918__issue15129.diff.txt uploaded by tilghman (license 14)
     Review:
           https://reviewboard.asterisk.org/r/372/
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/file.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/file.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/file.c?view=diff&rev=219669&r1=219668&r2=219669
==============================================================================
--- branches/1.6.2/main/file.c (original)
+++ branches/1.6.2/main/file.c Sun Sep 20 13:21:15 2009
@@ -869,6 +869,23 @@
 
 int ast_closestream(struct ast_filestream *f)
 {
+	/* This used to destroy the filestream, but it now just decrements a refcount.
+	 * We need to force the stream to quit queuing frames now, because we might
+	 * change the writeformat, which could result in a subsequent write error, if
+	 * the format is different. */
+
+	/* Stop a running stream if there is one */
+	if (f->owner) {
+		if (f->fmt->format < AST_FORMAT_AUDIO_MASK) {
+			f->owner->stream = NULL;
+			AST_SCHED_DEL(f->owner->sched, f->owner->streamid);
+			ast_settimeout(f->owner, 0, NULL, NULL);
+		} else {
+			f->owner->vstream = NULL;
+			AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid);
+		}
+	}
+
 	if (ast_test_flag(&f->fr, AST_FRFLAG_FROM_FILESTREAM)) {
 		/* If this flag is still set, it essentially means that the reference
 		 * count of f is non-zero. We can't destroy this filestream until