Add support for "musicclass" instead of "musiconhold" to make chan_zap compatible

with other channels.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8300 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 705ddf5f92837c981bde2bc816ebefd015fe630f..8db68fed9435a8b3b3aa12660b8b2c2c71d2bf4a 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -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 @@ static int setup_zap(int reload)
                        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);

diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 0014242bedab7436263a757a18ee8517fc77f7ef..ac797bf3e2888ab3f7af3e3f47dd3a1a5a721207 100644 (file)
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -454,7 +454,7 @@ immediate=no
 ; 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"