[svn-commits] trunk - r8300 in /trunk: channels/chan_zap.c configs/zapata.conf.sample

[svn-commits at lists.digium.com]

Author: oej
Date: Thu Jan 19 16:41:55 2006
New Revision: 8300

URL: http://svn.digium.com/view/asterisk?rev=8300&view=rev
Log:
Add support for "musicclass" instead of "musiconhold" to make chan_zap compatible
with other channels.

Modified:
    trunk/channels/chan_zap.c
    trunk/configs/zapata.conf.sample

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=8300&r1=8299&r2=8300&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Jan 19 16:41:55 2006
@@ -33,6 +33,8 @@
  * \arg \ref Config_zap
  *
  * \ingroup channel_drivers
+ *
+ * \todo Decprecate the "musiconhold" configuration option in v1.5dev
  */
 
 #include <stdio.h>
@@ -10529,7 +10531,7 @@
 			ast_copy_string(language, v->value, sizeof(language));
 		} else if (!strcasecmp(v->name, "progzone")) {
 			ast_copy_string(progzone, v->value, sizeof(progzone));
-		} else if (!strcasecmp(v->name, "musiconhold")) {
+		} else if (!strcasecmp(v->name, "musiconhold") || !strcasecmp(v->name, "musicclass")) {
 			ast_copy_string(musicclass, v->value, sizeof(musicclass));
 		} else if (!strcasecmp(v->name, "stripmsd")) {
 			stripmsd = atoi(v->value);

Modified: trunk/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/zapata.conf.sample?rev=8300&r1=8299&r2=8300&view=diff
==============================================================================
--- trunk/configs/zapata.conf.sample (original)
+++ trunk/configs/zapata.conf.sample Thu Jan 19 16:41:55 2006
@@ -454,7 +454,7 @@
 ; Select which class of music to use for music on hold.  If not specified
 ; then the default will be used.
 ;
-;musiconhold=default
+;musicclass=default
 ;
 ; PRI channels can have an idle extension and a minunused number.  So long as
 ; at least "minunused" channels are idle, chan_zap will try to call "idledial"