[asterisk-commits] tilghman: trunk r277452 - in /trunk: contrib/realtime/mysql/ res/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 16 15:25:11 2010
New Revision: 277452

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277452
Log:
Add documentation for MOH realtime fields

Added:
    trunk/contrib/realtime/mysql/musiconhold.sql   (with props)
Modified:
    trunk/res/res_musiconhold.c

Added: trunk/contrib/realtime/mysql/musiconhold.sql
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/realtime/mysql/musiconhold.sql?view=auto&rev=277452
==============================================================================
--- trunk/contrib/realtime/mysql/musiconhold.sql (added)
+++ trunk/contrib/realtime/mysql/musiconhold.sql Fri Jul 16 15:25:11 2010
@@ -1,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
+);
+

Propchange: trunk/contrib/realtime/mysql/musiconhold.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/contrib/realtime/mysql/musiconhold.sql
------------------------------------------------------------------------------
    svn:keywords = 'Date Author Id Revision Yoyo'

Propchange: trunk/contrib/realtime/mysql/musiconhold.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=277452&r1=277451&r2=277452
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Fri Jul 16 15:25:11 2010
@@ -1097,9 +1097,12 @@
 		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;
 }