From b39b2e0446d9bf31511f3e60c1649960fb37d7bc Mon Sep 17 00:00:00 2001 From: tilghman Date: Fri, 16 Jul 2010 20:30:40 +0000 Subject: Merged revisions 277452 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r277452 | tilghman | 2010-07-16 15:25:11 -0500 (Fri, 16 Jul 2010) | 2 lines Add documentation for MOH realtime fields ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277478 f38db490-d61c-443f-a65b-d21fe96a405b --- contrib/realtime/mysql/musiconhold.sql | 19 +++++++++++++++++++ res/res_musiconhold.c | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 contrib/realtime/mysql/musiconhold.sql diff --git a/contrib/realtime/mysql/musiconhold.sql b/contrib/realtime/mysql/musiconhold.sql new file mode 100644 index 000000000..63ccd8dc4 --- /dev/null +++ b/contrib/realtime/mysql/musiconhold.sql @@ -0,0 +1,19 @@ +CREATE TABLE musiconhold ( + -- Name of the MOH class + name char(80) not null primary key, + -- One of 'custom', 'files', 'mp3nb', 'quietmp3nb', or 'quietmp3' + mode char(80) null, + -- If 'custom', directory is ignored. Otherwise, specifies a directory with files to play or a stream URL + directory char(255) null, + -- If 'custom', application will be invoked to provide MOH. Ignored otherwise. + application char(255) null, + -- Digit associated with this MOH class, when MOH is selectable by the caller. + digit char(1) null, + -- One of 'random' or 'alpha', to determine how files are played. If NULL, files are played in directory order + sort char(10) null, + -- In custom mode, the format of the audio delivered. Ignored otherwise. Defaults to SLIN. + format char(10) null, + -- When this record was last modified + stamp timestamp +); + diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index ed2cdc1b0..1f86b88e3 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1071,9 +1071,12 @@ static int init_files_class(struct mohclass *class) return -1; } +#if 0 + /* XXX This isn't correct. Args is an application for custom mode. XXX */ if (strchr(class->args, 'r')) { ast_set_flag(class, MOH_RANDOMIZE); } +#endif return 0; } -- cgit v1.2.3