From 7ca01f39b7fb8c5998fd83edca0cbafc1d441f2a Mon Sep 17 00:00:00 2001 From: file Date: Thu, 12 Mar 2009 16:54:35 +0000 Subject: Merged revisions 181661 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r181661 | file | 2009-03-12 13:53:52 -0300 (Thu, 12 Mar 2009) | 19 lines Merged revisions 181659-181660 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r181659 | file | 2009-03-12 13:50:37 -0300 (Thu, 12 Mar 2009) | 8 lines Fix another scenario where depending on configuration the stream would not get read. For custom commands we don't know whether the audio is coming from a stream or not so we are going to have to read the data despite no channels. (closes issue #14416) Reported by: caspy ........ r181660 | file | 2009-03-12 13:52:45 -0300 (Thu, 12 Mar 2009) | 2 lines Fix logic flaw in previous commit. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@181662 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_musiconhold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 71c9c63c8..5edc89909 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -595,7 +595,7 @@ static void *monmp3thread(void *data) } res = 8 * MOH_MS_INTERVAL; /* 8 samples per millisecond */ } - if (strncasecmp(class->dir, "http://", 7) && AST_LIST_EMPTY(&class->members)) + if ((strncasecmp(class->dir, "http://", 7) && strncasecmp(class->dir, "nodir")) && AST_LIST_EMPTY(&class->members)) continue; /* Read mp3 audio */ len = ast_codec_get_len(class->format, res); -- cgit v1.2.3