diff options
| author | Olle Johansson <oej@edvina.net> | 2006-01-19 22:41:55 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-01-19 22:41:55 +0000 |
| commit | 3d456ce4f02a59b0467409feac7ec9cd35a92d8f (patch) | |
| tree | 1ba8b123af0ff030b231c98b6cf63a11e34bdd3e | |
| parent | 45c8956e0fa0545dc6d114119646af51774cc8fa (diff) | |
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
| -rw-r--r-- | channels/chan_zap.c | 4 | ||||
| -rw-r--r-- | configs/zapata.conf.sample | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 705ddf5f9..8db68fed9 100644 --- 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 0014242be..ac797bf3e 100644 --- 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" |