[svn-commits] elguero: branch 10 r364536 - /branches/10/apps/confbridge/conf_config_parser.c

[SVN commits to the Digium repositories]

Author: elguero
Date: Sat Apr 28 21:21:10 2012
New Revision: 364536

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364536
Log:
Fix configuring custom sound_leader_has_left in confbridge.conf

The configuration option to specify a custom sound_leader_has_left file for a
conference bridge was not being parsed.  This patch fixes it so that a custom
sound file will now be used.

(closes issue ASTERISK-19771)
Reported by: Pawel Kuzak
Tested by: Pawel Kuzak, Michael L. Young
Patches: leaderhasleft_sound.dpatch uploaded by Pawel Kuzak (license 6380)

Review: https://reviewboard.asterisk.org/r/1884/

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=364536&r1=364535&r2=364536
==============================================================================
--- branches/10/apps/confbridge/conf_config_parser.c (original)
+++ branches/10/apps/confbridge/conf_config_parser.c Sat Apr 28 21:21:10 2012
@@ -239,6 +239,8 @@
 		ast_string_field_set(sounds, placeintoconf, sound_file);
 	} else if (!strcasecmp(sound_name, "sound_wait_for_leader")) {
 		ast_string_field_set(sounds, waitforleader, sound_file);
+	} else if (!strcasecmp(sound_name, "sound_leader_has_left")) {
+		ast_string_field_set(sounds, leaderhasleft, sound_file);
 	} else if (!strcasecmp(sound_name, "sound_get_pin")) {
 		ast_string_field_set(sounds, getpin, sound_file);
 	} else if (!strcasecmp(sound_name, "sound_invalid_pin")) {
@@ -328,6 +330,7 @@
 		ast_string_field_set(sounds, otherinparty, tmp->sounds->otherinparty);
 		ast_string_field_set(sounds, placeintoconf, tmp->sounds->placeintoconf);
 		ast_string_field_set(sounds, waitforleader, tmp->sounds->waitforleader);
+		ast_string_field_set(sounds, leaderhasleft, tmp->sounds->leaderhasleft);
 		ast_string_field_set(sounds, getpin, tmp->sounds->getpin);
 		ast_string_field_set(sounds, invalidpin, tmp->sounds->invalidpin);
 		ast_string_field_set(sounds, locked, tmp->sounds->locked);
@@ -1021,6 +1024,7 @@
 	ast_cli(a->fd,"sound_other_in_party: %s\n", conf_get_sound(CONF_SOUND_OTHER_IN_PARTY, b_profile.sounds));
 	ast_cli(a->fd,"sound_place_into_conference: %s\n", conf_get_sound(CONF_SOUND_PLACE_IN_CONF, b_profile.sounds));
 	ast_cli(a->fd,"sound_wait_for_leader:       %s\n", conf_get_sound(CONF_SOUND_WAIT_FOR_LEADER, b_profile.sounds));
+	ast_cli(a->fd,"sound_leader_has_left:       %s\n", conf_get_sound(CONF_SOUND_LEADER_HAS_LEFT, b_profile.sounds));
 	ast_cli(a->fd,"sound_get_pin:        %s\n", conf_get_sound(CONF_SOUND_GET_PIN, b_profile.sounds));
 	ast_cli(a->fd,"sound_invalid_pin:    %s\n", conf_get_sound(CONF_SOUND_INVALID_PIN, b_profile.sounds));
 	ast_cli(a->fd,"sound_locked:         %s\n", conf_get_sound(CONF_SOUND_LOCKED, b_profile.sounds));