[asterisk-commits] mjordan: branch 10 r373196 - /branches/10/apps/confbridge/conf_config_parser.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Sep 19 21:35:13 2012
New Revision: 373196

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373196
Log:
Ensure that all ConfBridge sounds can be set using CONFBRIDGE function

The CONFBRIDGE function can be used to set the sounds in a ConfBridge
bridge profile.  Unfortunately, three sounds were missed in the portion
of the code that applies the settings passed in from the function:
sound_only_one, join, and leave.  This patch makes sure that the sounds
passed from the function are applied to the bridge profile.

(closes issue ASTERISK-20404)
Reported by: univ
Tested by: mjordan

Modified:
    branches/10/apps/confbridge/conf_config_parser.c

Modified: branches/10/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/confbridge/conf_config_parser.c?view=diff&rev=373196&r1=373195&r2=373196
==============================================================================
--- branches/10/apps/confbridge/conf_config_parser.c (original)
+++ branches/10/apps/confbridge/conf_config_parser.c Wed Sep 19 21:35:13 2012
@@ -325,6 +325,7 @@
 		 * structure of a dynamic profile will need to be altered, a completely new sounds structure must be
 		 * create instead of simply holding a reference to the one built by the config file. */
 		ast_string_field_set(sounds, onlyperson, tmp->sounds->onlyperson);
+		ast_string_field_set(sounds, onlyone, tmp->sounds->onlyone);
 		ast_string_field_set(sounds, hasjoin, tmp->sounds->hasjoin);
 		ast_string_field_set(sounds, hasleft, tmp->sounds->hasleft);
 		ast_string_field_set(sounds, kicked, tmp->sounds->kicked);
@@ -341,6 +342,8 @@
 		ast_string_field_set(sounds, unlockednow, tmp->sounds->unlockednow);
 		ast_string_field_set(sounds, lockednow, tmp->sounds->lockednow);
 		ast_string_field_set(sounds, errormenu, tmp->sounds->errormenu);
+		ast_string_field_set(sounds, join, tmp->sounds->join);
+		ast_string_field_set(sounds, leave, tmp->sounds->leave);
 
 		ao2_ref(tmp->sounds, -1); /* sounds struct copied over to it from the template by reference only. */
 		ao2_ref(oldsounds,-1);    /* original sounds struct we don't need anymore */