[asterisk-commits] file: branch 1.6.1 r181658 - in /branches/1.6.1: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar 12 11:34:41 2009
New Revision: 181658

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_musiconhold.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/res_musiconhold.c?view=diff&rev=181658&r1=181657&r2=181658
==============================================================================
--- branches/1.6.1/res/res_musiconhold.c (original)
+++ branches/1.6.1/res/res_musiconhold.c Thu Mar 12 11:34:41 2009
@@ -567,11 +567,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);