[asterisk-commits] rmudgett: trunk r397494 - in /trunk: apps/ bridges/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Aug 22 18:15:14 2013
New Revision: 397494

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397494
Log:
Minor tweaks with ast_start_moh() callers.

Modified:
    trunk/apps/app_followme.c
    trunk/bridges/bridge_holding.c
    trunk/main/channel.c

Modified: trunk/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_followme.c?view=diff&rev=397494&r1=397493&r2=397494
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Thu Aug 22 18:15:14 2013
@@ -1424,7 +1424,7 @@
 			if (ast_waitstream(chan, "") < 0)
 				goto outrun;
 		}
-		ast_moh_start(chan, S_OR(targs->mohclass, NULL), NULL);
+		ast_moh_start(chan, targs->mohclass, NULL);
 	}
 
 	ast_channel_lock(chan);

Modified: trunk/bridges/bridge_holding.c
URL: http://svnview.digium.com/svn/asterisk/trunk/bridges/bridge_holding.c?view=diff&rev=397494&r1=397493&r2=397494
==============================================================================
--- trunk/bridges/bridge_holding.c (original)
+++ trunk/bridges/bridge_holding.c Thu Aug 22 18:15:14 2013
@@ -204,7 +204,7 @@
 	switch(hc->idle_mode) {
 	case IDLE_MODE_MOH:
 		moh_class = ast_bridge_channel_get_role_option(bridge_channel, "holding_participant", "moh_class");
-		ast_moh_start(bridge_channel->chan, ast_strlen_zero(moh_class) ? NULL : moh_class, NULL);
+		ast_moh_start(bridge_channel->chan, moh_class, NULL);
 		break;
 	case IDLE_MODE_RINGING:
 		ast_indicate(bridge_channel->chan, AST_CONTROL_RINGING);

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=397494&r1=397493&r2=397494
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Aug 22 18:15:14 2013
@@ -7193,7 +7193,6 @@
 	ast_moh_cleanup_ptr = NULL;
 }
 
-/*! \brief Turn on music on hold on a given channel */
 int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass)
 {
 	if (ast_moh_start_ptr)
@@ -7204,7 +7203,6 @@
 	return 0;
 }
 
-/*! \brief Turn off music on hold on a given channel */
 void ast_moh_stop(struct ast_channel *chan)
 {
 	if (ast_moh_stop_ptr)