From: Mark Spencer <markster@digium.com>
Date: Mon, 3 Jan 2005 01:37:44 +0000 (+0000)
Subject: Rename musiconhold option for consistency (bug #3163)
X-Git-Tag: 1.2.0-beta1~1509
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=4b5e3caa7d685bb7906d2bfad05ab88d14d9bcf3;hp=75d674dd9b41591002c076ff8ee9acaee2f03e0e

Rename musiconhold option for consistency (bug #3163)


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2fea907..808a9fd 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2203,7 +2203,7 @@ static void reload_queues(void)
 								q->members = cur;
 							prev = cur;
 						}
-					} else if (!strcasecmp(var->name, "music")) {
+					} else if (!strcasecmp(var->name, "music") || !strcasecmp(var->name, "musiconhold")) {
 						strncpy(q->moh, var->value, sizeof(q->moh) - 1);
 					} else if (!strcasecmp(var->name, "announce")) {
 						strncpy(q->announce, var->value, sizeof(q->announce) - 1);
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index f6975b6..254e1b6 100755
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -23,10 +23,10 @@ persistentmembers = yes
 ;
 ; A sample call queue
 ;
-; Music sets which musiconhold applies for this particular
-; call queue
+; Musiconhold sets which music applies for this particular
+; call queue (configure classes in musiconhold.conf)
 ;
-;music = default
+;musiconhold = default
 ;
 ; An announcement may be specified which is played for the member as
 ; soon as they answer a call, typically to indicate to them which queue