[svn-commits] file: trunk r181656 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Mar 12 11:32:20 2009
New Revision: 181656

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181656
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=181656&r1=181655&r2=181656
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Mar 12 11:32:20 2009
@@ -568,11 +568,11 @@
 			}
 			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);