From 0473b44b5cfe078ed612ba14663afc9c6052abe7 Mon Sep 17 00:00:00 2001 From: file Date: Thu, 12 Mar 2009 16:34:41 +0000 Subject: Merged revisions 181656 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r181656 | file | 2009-03-12 13:32:20 -0300 (Thu, 12 Mar 2009) | 17 lines Merged revisions 181655 via svnmerge from 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@181658 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_musiconhold.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index c59cdb92d..594b667e1 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -567,11 +567,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); -- cgit v1.2.3