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/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@219667 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/file.c b/main/file.c
index ac9c68681597edb86218b87af66fbaaceb6d4519..8fedf754affbffaf959a7123550ea330117d0200 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -869,6 +869,23 @@ int ast_stream_rewind(struct ast_filestream *fs, off_t ms)
 
 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