]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10341: [mod_conference] Remove unused conference object member from FS-5461 #resolve
authorBrian West <brian@freeswitch.org>
Wed, 24 May 2017 22:30:12 +0000 (17:30 -0500)
committerBrian West <brian@freeswitch.org>
Wed, 24 May 2017 22:30:12 +0000 (17:30 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 042bd9ccfe3a33dae2d0621c70e55738d2e1d457..7355a27760cc8b61765ba26f91f94d072cb29b6c 100644 (file)
@@ -2599,7 +2599,6 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
        char *is_locked_sound = NULL;
        char *is_unlocked_sound = NULL;
        char *kicked_sound = NULL;
-       char *join_only_sound = NULL;
        char *deaf_sound = NULL;
        char *undeaf_sound = NULL;
        char *pin = NULL;
@@ -2864,8 +2863,6 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
                                cdr_event_mode = val;
                        } else if (!strcasecmp(var, "kicked-sound") && !zstr(val)) {
                                kicked_sound = val;
-                       } else if (!strcasecmp(var, "join-only-sound") && !zstr(val)) {
-                               join_only_sound = val;
                        } else if (!strcasecmp(var, "pin") && !zstr(val)) {
                                pin = val;
                        } else if (!strcasecmp(var, "moderator-pin") && !zstr(val)) {
@@ -3322,10 +3319,6 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
                conference->kicked_sound = switch_core_strdup(conference->pool, kicked_sound);
        }
 
-       if (!zstr(join_only_sound)) {
-               conference->join_only_sound = switch_core_strdup(conference->pool, join_only_sound);
-       }
-
        if (!zstr(pin_sound)) {
                conference->pin_sound = switch_core_strdup(conference->pool, pin_sound);
        }