[asterisk-commits] file: branch 1.4 r181659 - /branches/1.4/res/res_musiconhold.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Mar 12 11:50:41 CDT 2009


Author: file
Date: Thu Mar 12 11:50:37 2009
New Revision: 181659

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

Modified:
    branches/1.4/res/res_musiconhold.c

Modified: branches/1.4/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/res/res_musiconhold.c?view=diff&rev=181659&r1=181658&r2=181659
==============================================================================
--- branches/1.4/res/res_musiconhold.c (original)
+++ branches/1.4/res/res_musiconhold.c Thu Mar 12 11:50:37 2009
@@ -557,7 +557,7 @@
 			}
 			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) || !strcasecmp(class->dir, "nodir")) && AST_LIST_EMPTY(&class->members))
 			continue;
 		/* Read mp3 audio */
 		len = ast_codec_get_len(class->format, res);




More information about the asterisk-commits mailing list