Merged revisions 181655 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 16:32:20 +0000 (16:32 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 16:32:20 +0000 (16:32 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r181655 | file | 2009-03-12 13:29:19 -0300 (Thu, 12 Mar 2009) | 10 lines

  Fix issue with streaming MOH failing if nobody is listening.

  When a music class is setup to actually provide music on hold
  from a stream we need to constantly read audio from it since it
  will constantly be providing audio. This is now done despite there
  being no channels listening to it.

  (closes issue #14416)
  Reported by: caspy
........

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

res/res_musiconhold.c

index 0bf69e6..e9439cf 100644 (file)
@@ -568,11 +568,11 @@ static void *monmp3thread(void *data)
                        }
                        res = 8 * MOH_MS_INTERVAL;      /* 8 samples per millisecond */
                }
-               if (AST_LIST_EMPTY(&class->members))
+               if (strncasecmp(class->dir, "http://", 7) && AST_LIST_EMPTY(&class->members))
                        continue;
                /* Read mp3 audio */
                len = ast_codec_get_len(class->format, res);
-               
+
                if ((res2 = read(class->srcfd, sbuf, len)) != len) {
                        if (!res2) {
                                close(class->srcfd);