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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277478 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/realtime/mysql/musiconhold.sql b/contrib/realtime/mysql/musiconhold.sql
new file mode 100644 (file)
index 0000000..63ccd8d
--- /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 ed2cdc1b0538c9d8bdbabf4707c992fc5f78bb52..1f86b88e3779674321451a66890947808e1ee007 100644 (file)
--- 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;
 }