]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Adjust core and add video caps to mod_conference with video follow audio (first cut)
authorAnthony Minessale <anthony.minessale@gmail.com>
Mon, 10 Nov 2008 18:26:41 +0000 (18:26 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Mon, 10 Nov 2008 18:26:41 +0000 (18:26 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10314 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/include/switch_core.h
src/include/switch_rtp.h
src/mod/applications/mod_conference/mod_conference.c
src/mod/endpoints/mod_sofia/mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.h
src/mod/endpoints/mod_sofia/sofia_glue.c
src/switch_rtp.c
src/switch_time.c

index 97c44b513bd644f6a23eaad6ca7c65214476a64a..bf5730a90a385714ddfb83fcaa41d27b430c8f7a 100644 (file)
@@ -1678,8 +1678,8 @@ SWITCH_DECLARE(uint32_t) switch_core_max_dtmf_duration(uint32_t duration);
 SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration);
 SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string);
 SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string);
-
 SWITCH_DECLARE(int) switch_system(const char *cmd, switch_bool_t wait);
+SWITCH_DECLARE(void) switch_cond_yield(uint32_t ms);
 
 ///\}
 
index bef6595757ab2fa19ce91af8c00cb0a8f340d079..8ba8e7e9a95166af00094fdc145c63649989096a 100644 (file)
@@ -110,6 +110,8 @@ SWITCH_DECLARE(switch_port_t) switch_rtp_set_end_port(switch_port_t port);
 */
 SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip);
 SWITCH_DECLARE(void) switch_rtp_release_port(const char *ip, switch_port_t port);
+
+SWITCH_DECLARE(void) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval);
 /*! 
   \brief create a new RTP session handle
   \param new_rtp_session a poiter to aim at the new session
index 838d71e145c9d5ed52ecdac6e9e06990efca1358..a47acf6907bedefe2215dab2d6158dd03cfea5fa 100644 (file)
@@ -60,40 +60,40 @@ static int EC = 0;
 #define test_eflag(conference, flag) ((conference)->eflags & flag)
 
 typedef enum {
-       FILE_STOP_CURRENT,
-       FILE_STOP_ALL,
-       FILE_STOP_ASYNC
+    FILE_STOP_CURRENT,
+    FILE_STOP_ALL,
+    FILE_STOP_ASYNC
 } file_stop_t;
 
 /* Global Values */
 static struct {
-       switch_memory_pool_t *conference_pool;
-       switch_mutex_t *conference_mutex;
-       switch_hash_t *conference_hash;
-       switch_mutex_t *id_mutex;
-       switch_mutex_t *hash_mutex;
-       uint32_t id_pool;
-       int32_t running;
-       uint32_t threads;
-       switch_event_node_t *node;
+    switch_memory_pool_t *conference_pool;
+    switch_mutex_t *conference_mutex;
+    switch_hash_t *conference_hash;
+    switch_mutex_t *id_mutex;
+    switch_mutex_t *hash_mutex;
+    uint32_t id_pool;
+    int32_t running;
+    uint32_t threads;
+    switch_event_node_t *node;
 } globals;
 
 typedef enum {
-       CALLER_CONTROL_MUTE,
-       CALLER_CONTROL_DEAF_MUTE,
-       CALLER_CONTROL_ENERGY_UP,
-       CALLER_CONTROL_ENERGY_EQU_CONF,
-       CALLER_CONTROL_ENERGEY_DN,
-       CALLER_CONTROL_VOL_TALK_UP,
-       CALLER_CONTROL_VOL_TALK_ZERO,
-       CALLER_CONTROL_VOL_TALK_DN,
-       CALLER_CONTROL_VOL_LISTEN_UP,
-       CALLER_CONTROL_VOL_LISTEN_ZERO,
-       CALLER_CONTROL_VOL_LISTEN_DN,
-       CALLER_CONTROL_HANGUP,
-       CALLER_CONTROL_MENU,
-       CALLER_CONTROL_DIAL,
-       CALLER_CONTROL_EVENT
+    CALLER_CONTROL_MUTE,
+    CALLER_CONTROL_DEAF_MUTE,
+    CALLER_CONTROL_ENERGY_UP,
+    CALLER_CONTROL_ENERGY_EQU_CONF,
+    CALLER_CONTROL_ENERGEY_DN,
+    CALLER_CONTROL_VOL_TALK_UP,
+    CALLER_CONTROL_VOL_TALK_ZERO,
+    CALLER_CONTROL_VOL_TALK_DN,
+    CALLER_CONTROL_VOL_LISTEN_UP,
+    CALLER_CONTROL_VOL_LISTEN_ZERO,
+    CALLER_CONTROL_VOL_LISTEN_DN,
+    CALLER_CONTROL_HANGUP,
+    CALLER_CONTROL_MENU,
+    CALLER_CONTROL_DIAL,
+    CALLER_CONTROL_EVENT
 } caller_control_t;
 
 /* forward declaration for conference_obj and caller_control */
@@ -101,237 +101,237 @@ struct conference_member;
 typedef struct conference_member conference_member_t;
 
 struct call_list {
-       char *string;
-       int itteration;
-       struct call_list *next;
+    char *string;
+    int itteration;
+    struct call_list *next;
 };
 typedef struct call_list call_list_t;
 
 struct caller_control_actions;
 
 typedef struct caller_control_fn_table {
-       char *key;
-       char *digits;
-       caller_control_t action;
-       void (*handler) (conference_member_t *, struct caller_control_actions *);
+    char *key;
+    char *digits;
+    caller_control_t action;
+    void (*handler) (conference_member_t *, struct caller_control_actions *);
 } caller_control_fn_table_t;
 
 typedef struct caller_control_actions {
-       caller_control_fn_table_t *fndesc;
-       char *binded_dtmf;
-       void *data;
+    caller_control_fn_table_t *fndesc;
+    char *binded_dtmf;
+    void *data;
 } caller_control_action_t;
 
 typedef struct caller_control_menu_info {
-       switch_ivr_menu_t *stack;
-       char *name;
+    switch_ivr_menu_t *stack;
+    char *name;
 } caller_control_menu_info_t;
 
 typedef enum {
-       MFLAG_RUNNING = (1 << 0),
-       MFLAG_CAN_SPEAK = (1 << 1),
-       MFLAG_CAN_HEAR = (1 << 2),
-       MFLAG_KICKED = (1 << 3),
-       MFLAG_ITHREAD = (1 << 4),
-       MFLAG_NOCHANNEL = (1 << 5),
-       MFLAG_INTREE = (1 << 6),
-       MFLAG_WASTE_BANDWIDTH = (1 << 7),
-       MFLAG_FLUSH_BUFFER = (1 << 8),
-       MFLAG_ENDCONF = (1 << 9),
-       MFLAG_HAS_AUDIO = (1 << 10),
-       MFLAG_TALKING = (1 << 11)
+    MFLAG_RUNNING = (1 << 0),
+    MFLAG_CAN_SPEAK = (1 << 1),
+    MFLAG_CAN_HEAR = (1 << 2),
+    MFLAG_KICKED = (1 << 3),
+    MFLAG_ITHREAD = (1 << 4),
+    MFLAG_NOCHANNEL = (1 << 5),
+    MFLAG_INTREE = (1 << 6),
+    MFLAG_WASTE_BANDWIDTH = (1 << 7),
+    MFLAG_FLUSH_BUFFER = (1 << 8),
+    MFLAG_ENDCONF = (1 << 9),
+    MFLAG_HAS_AUDIO = (1 << 10),
+    MFLAG_TALKING = (1 << 11)
 } member_flag_t;
 
 typedef enum {
-       CFLAG_RUNNING = (1 << 0),
-       CFLAG_DYNAMIC = (1 << 1),
-       CFLAG_ENFORCE_MIN = (1 << 2),
-       CFLAG_DESTRUCT = (1 << 3),
-       CFLAG_LOCKED = (1 << 4),
-       CFLAG_ANSWERED = (1 << 5)
+    CFLAG_RUNNING = (1 << 0),
+    CFLAG_DYNAMIC = (1 << 1),
+    CFLAG_ENFORCE_MIN = (1 << 2),
+    CFLAG_DESTRUCT = (1 << 3),
+    CFLAG_LOCKED = (1 << 4),
+    CFLAG_ANSWERED = (1 << 5)
 } conf_flag_t;
 
 typedef enum {
-       RFLAG_CAN_SPEAK = (1 << 0),
-       RFLAG_CAN_HEAR = (1 << 1)
+    RFLAG_CAN_SPEAK = (1 << 0),
+    RFLAG_CAN_HEAR = (1 << 1)
 } relation_flag_t;
 
 typedef enum {
-       NODE_TYPE_FILE,
-       NODE_TYPE_SPEECH
+    NODE_TYPE_FILE,
+    NODE_TYPE_SPEECH
 } node_type_t;
 
 typedef enum {
-       EFLAG_ADD_MEMBER = (1 << 0),
-       EFLAG_DEL_MEMBER = (1 << 1),
-       EFLAG_ENERGY_LEVEL = (1 << 2),
-       EFLAG_VOLUME_LEVEL = (1 << 3),
-       EFLAG_GAIN_LEVEL = (1 << 4),
-       EFLAG_DTMF = (1 << 5),
-       EFLAG_STOP_TALKING = (1 << 6),
-       EFLAG_START_TALKING = (1 << 7),
-       EFLAG_MUTE_MEMBER = (1 << 8),
-       EFLAG_UNMUTE_MEMBER = (1 << 9),
-       EFLAG_DEAF_MEMBER = (1 << 10),
-       EFLAG_UNDEAF_MEMBER = (1 << 11),
-       EFLAG_KICK_MEMBER = (1 << 12),
-       EFLAG_DTMF_MEMBER = (1 << 13),
-       EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14),
-       EFLAG_VOLUME_IN_MEMBER = (1 << 15),
-       EFLAG_VOLUME_OUT_MEMBER = (1 << 16),
-       EFLAG_PLAY_FILE = (1 << 17),
-       EFLAG_PLAY_FILE_MEMBER = (1 << 18),
-       EFLAG_SPEAK_TEXT = (1 << 19),
-       EFLAG_SPEAK_TEXT_MEMBER = (1 << 20),
-       EFLAG_LOCK = (1 << 21),
-       EFLAG_UNLOCK = (1 << 22),
-       EFLAG_TRANSFER = (1 << 23),
-       EFLAG_BGDIAL_RESULT = (1 << 24),
-       EFLAG_FLOOR_CHANGE = (1 << 25)
+    EFLAG_ADD_MEMBER = (1 << 0),
+    EFLAG_DEL_MEMBER = (1 << 1),
+    EFLAG_ENERGY_LEVEL = (1 << 2),
+    EFLAG_VOLUME_LEVEL = (1 << 3),
+    EFLAG_GAIN_LEVEL = (1 << 4),
+    EFLAG_DTMF = (1 << 5),
+    EFLAG_STOP_TALKING = (1 << 6),
+    EFLAG_START_TALKING = (1 << 7),
+    EFLAG_MUTE_MEMBER = (1 << 8),
+    EFLAG_UNMUTE_MEMBER = (1 << 9),
+    EFLAG_DEAF_MEMBER = (1 << 10),
+    EFLAG_UNDEAF_MEMBER = (1 << 11),
+    EFLAG_KICK_MEMBER = (1 << 12),
+    EFLAG_DTMF_MEMBER = (1 << 13),
+    EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14),
+    EFLAG_VOLUME_IN_MEMBER = (1 << 15),
+    EFLAG_VOLUME_OUT_MEMBER = (1 << 16),
+    EFLAG_PLAY_FILE = (1 << 17),
+    EFLAG_PLAY_FILE_MEMBER = (1 << 18),
+    EFLAG_SPEAK_TEXT = (1 << 19),
+    EFLAG_SPEAK_TEXT_MEMBER = (1 << 20),
+    EFLAG_LOCK = (1 << 21),
+    EFLAG_UNLOCK = (1 << 22),
+    EFLAG_TRANSFER = (1 << 23),
+    EFLAG_BGDIAL_RESULT = (1 << 24),
+    EFLAG_FLOOR_CHANGE = (1 << 25)
 } event_type_t;
 
 typedef struct conference_file_node {
-       switch_file_handle_t fh;
-       switch_speech_handle_t *sh;
-       node_type_t type;
-       uint8_t done;
-       uint8_t async;
-       switch_memory_pool_t *pool;
-       uint32_t leadin;
-       struct conference_file_node *next;
+    switch_file_handle_t fh;
+    switch_speech_handle_t *sh;
+    node_type_t type;
+    uint8_t done;
+    uint8_t async;
+    switch_memory_pool_t *pool;
+    uint32_t leadin;
+    struct conference_file_node *next;
 } conference_file_node_t;
 
 /* conference xml config sections */
 typedef struct conf_xml_cfg {
-       switch_xml_t profile;
-       switch_xml_t controls;
+    switch_xml_t profile;
+    switch_xml_t controls;
 } conf_xml_cfg_t;
 
 /* Conference Object */
 typedef struct conference_obj {
-       char *name;
-       char *timer_name;
-       char *tts_engine;
-       char *tts_voice;
-       char *enter_sound;
-       char *exit_sound;
-       char *alone_sound;
-       char *perpetual_sound;
-       char *moh_sound;
-       char *ack_sound;
-       char *nack_sound;
-       char *muted_sound;
-       char *unmuted_sound;
-       char *locked_sound;
-       char *is_locked_sound;
-       char *is_unlocked_sound;
-       char *kicked_sound;
-       char *caller_id_name;
-       char *caller_id_number;
-       char *sound_prefix;
-       char *special_announce;
-       char *auto_record;
-       uint32_t max_members;
-       char *maxmember_sound;
-       uint32_t announce_count;
-       switch_ivr_digit_stream_parser_t *dtmf_parser;
-       char *pin;
-       char *pin_sound;
-       char *bad_pin_sound;
-       char *profile_name;
-       char *domain;
-       uint32_t flags;
-       member_flag_t mflags;
-       switch_call_cause_t bridge_hangup_cause;
-       switch_mutex_t *flag_mutex;
-       uint32_t rate;
-       uint32_t interval;
-       switch_mutex_t *mutex;
-       conference_member_t *members;
-       conference_member_t *floor_holder;
-       switch_mutex_t *member_mutex;
-       conference_file_node_t *fnode;
-       conference_file_node_t *async_fnode;
-       switch_memory_pool_t *pool;
-       switch_thread_rwlock_t *rwlock;
-       uint32_t count;
-       int32_t energy_level;
-       uint8_t min;
-       switch_speech_handle_t lsh;
-       switch_speech_handle_t *sh;
-       switch_byte_t *not_talking_buf;
-       uint32_t not_talking_buf_len;
-       int comfort_noise_level;
-       int video_running;
-       uint32_t eflags;
+    char *name;
+    char *timer_name;
+    char *tts_engine;
+    char *tts_voice;
+    char *enter_sound;
+    char *exit_sound;
+    char *alone_sound;
+    char *perpetual_sound;
+    char *moh_sound;
+    char *ack_sound;
+    char *nack_sound;
+    char *muted_sound;
+    char *unmuted_sound;
+    char *locked_sound;
+    char *is_locked_sound;
+    char *is_unlocked_sound;
+    char *kicked_sound;
+    char *caller_id_name;
+    char *caller_id_number;
+    char *sound_prefix;
+    char *special_announce;
+    char *auto_record;
+    uint32_t max_members;
+    char *maxmember_sound;
+    uint32_t announce_count;
+    switch_ivr_digit_stream_parser_t *dtmf_parser;
+    char *pin;
+    char *pin_sound;
+    char *bad_pin_sound;
+    char *profile_name;
+    char *domain;
+    uint32_t flags;
+    member_flag_t mflags;
+    switch_call_cause_t bridge_hangup_cause;
+    switch_mutex_t *flag_mutex;
+    uint32_t rate;
+    uint32_t interval;
+    switch_mutex_t *mutex;
+    conference_member_t *members;
+    conference_member_t *floor_holder;
+    switch_mutex_t *member_mutex;
+    conference_file_node_t *fnode;
+    conference_file_node_t *async_fnode;
+    switch_memory_pool_t *pool;
+    switch_thread_rwlock_t *rwlock;
+    uint32_t count;
+    int32_t energy_level;
+    uint8_t min;
+    switch_speech_handle_t lsh;
+    switch_speech_handle_t *sh;
+    switch_byte_t *not_talking_buf;
+    uint32_t not_talking_buf_len;
+    int comfort_noise_level;
+    int video_running;
+    uint32_t eflags;
 } conference_obj_t;
 
 /* Relationship with another member */
 typedef struct conference_relationship {
-       uint32_t id;
-       uint32_t flags;
-       struct conference_relationship *next;
+    uint32_t id;
+    uint32_t flags;
+    struct conference_relationship *next;
 } conference_relationship_t;
 
 /* Conference Member Object */
 struct conference_member {
-       uint32_t id;
-       switch_core_session_t *session;
-       conference_obj_t *conference;
-       switch_memory_pool_t *pool;
-       switch_buffer_t *audio_buffer;
-       switch_buffer_t *mux_buffer;
-       switch_buffer_t *resample_buffer;
-       uint32_t flags;
-       uint32_t score;
-       switch_mutex_t *flag_mutex;
-       switch_mutex_t *audio_in_mutex;
-       switch_mutex_t *audio_out_mutex;
-       switch_codec_t *orig_read_codec;
-       switch_codec_t read_codec;
-       switch_codec_t write_codec;
-       char *rec_path;
-       uint8_t *frame;
-       uint32_t frame_size;
-       uint8_t *mux_frame;
-       uint32_t read;
-       int32_t energy_level;
-       int32_t volume_in_level;
-       int32_t volume_out_level;
-       uint32_t native_rate;
-       switch_audio_resampler_t *read_resampler;
-       int16_t *resample_out;
-       uint32_t resample_out_len;
-       conference_file_node_t *fnode;
-       conference_relationship_t *relationships;
-       switch_ivr_digit_stream_parser_t *dtmf_parser;
-       switch_ivr_digit_stream_t *digit_stream;
-       switch_speech_handle_t lsh;
-       switch_speech_handle_t *sh;
-       struct conference_member *next;
+    uint32_t id;
+    switch_core_session_t *session;
+    conference_obj_t *conference;
+    switch_memory_pool_t *pool;
+    switch_buffer_t *audio_buffer;
+    switch_buffer_t *mux_buffer;
+    switch_buffer_t *resample_buffer;
+    uint32_t flags;
+    uint32_t score;
+    switch_mutex_t *flag_mutex;
+    switch_mutex_t *audio_in_mutex;
+    switch_mutex_t *audio_out_mutex;
+    switch_codec_t *orig_read_codec;
+    switch_codec_t read_codec;
+    switch_codec_t write_codec;
+    char *rec_path;
+    uint8_t *frame;
+    uint32_t frame_size;
+    uint8_t *mux_frame;
+    uint32_t read;
+    int32_t energy_level;
+    int32_t volume_in_level;
+    int32_t volume_out_level;
+    uint32_t native_rate;
+    switch_audio_resampler_t *read_resampler;
+    int16_t *resample_out;
+    uint32_t resample_out_len;
+    conference_file_node_t *fnode;
+    conference_relationship_t *relationships;
+    switch_ivr_digit_stream_parser_t *dtmf_parser;
+    switch_ivr_digit_stream_t *digit_stream;
+    switch_speech_handle_t lsh;
+    switch_speech_handle_t *sh;
+    struct conference_member *next;
 };
 
 /* Record Node */
 typedef struct conference_record {
-       conference_obj_t *conference;
-       char *path;
-       switch_memory_pool_t *pool;
+    conference_obj_t *conference;
+    char *path;
+    switch_memory_pool_t *pool;
 } conference_record_t;
 
 typedef enum {
-       CONF_API_SUB_ARGS_SPLIT,
-       CONF_API_SUB_MEMBER_TARGET,
-       CONF_API_SUB_ARGS_AS_ONE
+    CONF_API_SUB_ARGS_SPLIT,
+    CONF_API_SUB_MEMBER_TARGET,
+    CONF_API_SUB_ARGS_AS_ONE
 } conference_fntype_t;
 
 typedef void (*void_fn_t) (void);
 
 /* API command parser */
 typedef struct api_command {
-       char *pname;
-       void_fn_t pfnapicmd;
-       conference_fntype_t fntype;
-       char *psyntax;
+    char *pname;
+    void_fn_t pfnapicmd;
+    conference_fntype_t fntype;
+    char *psyntax;
 } api_command_t;
 
 /* Function Prototypes */
@@ -352,13 +352,13 @@ static void conference_list(conference_obj_t *conference, switch_stream_handle_t
 SWITCH_STANDARD_API(conf_api_main);
 
 static switch_status_t conference_outcall(conference_obj_t *conference,
-                                                                                 char *conference_name,
-                                                                                 switch_core_session_t *session,
-                                                                                 char *bridgeto, uint32_t timeout, char *flags, char *cid_name, char *cid_num, switch_call_cause_t *cause);
+                                          char *conference_name,
+                                          switch_core_session_t *session,
+                                          char *bridgeto, uint32_t timeout, char *flags, char *cid_name, char *cid_num, switch_call_cause_t *cause);
 static switch_status_t conference_outcall_bg(conference_obj_t *conference,
-                                                                                        char *conference_name,
-                                                                                        switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
-                                                                                        const char *cid_num);
+                                             char *conference_name,
+                                             switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
+                                             const char *cid_num);
 SWITCH_STANDARD_APP(conference_function);
 static void launch_conference_thread(conference_obj_t *conference);
 static void launch_conference_video_thread(conference_obj_t *conference);
@@ -385,1345 +385,1357 @@ static switch_status_t conference_add_event_member_data(conference_member_t *mem
 
 static switch_status_t conference_add_event_data(conference_obj_t *conference, switch_event_t *event)
 {
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
 
-       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name);
-       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Size", "%u", conference->count);
-       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Conference-Profile-Name", conference->profile_name);
+    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name);
+    switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Size", "%u", conference->count);
+    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Conference-Profile-Name", conference->profile_name);
 
-       return status;
+    return status;
 }
 
 static switch_status_t conference_add_event_member_data(conference_member_t *member, switch_event_t *event)
 {
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
 
-       if (!member)
-               return status;
+    if (!member)
+        return status;
 
-       if (member->session) {
-               switch_channel_t *channel = switch_core_session_get_channel(member->session);
-               switch_channel_event_set_data(channel, event);
-       }
+    if (member->session) {
+        switch_channel_t *channel = switch_core_session_get_channel(member->session);
+        switch_channel_event_set_data(channel, event);
+    }
 
-       if (member->conference) {
-               status = conference_add_event_data(member->conference, event);
-       }
+    if (member->conference) {
+        status = conference_add_event_data(member->conference, event);
+    }
 
-       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
+    switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
 
-       return status;
+    return status;
 }
 
 /* Return a Distinct ID # */
 static uint32_t next_member_id(void)
 {
-       uint32_t id;
+    uint32_t id;
 
-       switch_mutex_lock(globals.id_mutex);
-       id = ++globals.id_pool;
-       switch_mutex_unlock(globals.id_mutex);
+    switch_mutex_lock(globals.id_mutex);
+    id = ++globals.id_pool;
+    switch_mutex_unlock(globals.id_mutex);
 
-       return id;
+    return id;
 }
 
 /* if other_member has a relationship with member, produce it */
 static conference_relationship_t *member_get_relationship(conference_member_t *member, conference_member_t *other_member)
 {
-       conference_relationship_t *rel = NULL, *global = NULL;
+    conference_relationship_t *rel = NULL, *global = NULL;
 
-       if (member == NULL || other_member == NULL || member->relationships == NULL)
-               return NULL;
+    if (member == NULL || other_member == NULL || member->relationships == NULL)
+        return NULL;
 
-       switch_mutex_lock(member->flag_mutex);
-       switch_mutex_lock(other_member->flag_mutex);
+    switch_mutex_lock(member->flag_mutex);
+    switch_mutex_lock(other_member->flag_mutex);
 
-       for (rel = member->relationships; rel; rel = rel->next) {
-               if (rel->id == other_member->id) {
-                       break;
-               }
+    for (rel = member->relationships; rel; rel = rel->next) {
+        if (rel->id == other_member->id) {
+            break;
+        }
 
-               /* 0 matches everyone. (We will still test the others because a real match carries more clout) */
-               if (rel->id == 0) {
-                       global = rel;
-               }
-       }
+        /* 0 matches everyone. (We will still test the others because a real match carries more clout) */
+        if (rel->id == 0) {
+            global = rel;
+        }
+    }
 
-       switch_mutex_unlock(other_member->flag_mutex);
-       switch_mutex_unlock(member->flag_mutex);
+    switch_mutex_unlock(other_member->flag_mutex);
+    switch_mutex_unlock(member->flag_mutex);
 
-       return rel ? rel : global;
+    return rel ? rel : global;
 }
 
 /* traverse the conference member list for the specified member id and return it's pointer */
 static conference_member_t *conference_member_get(conference_obj_t *conference, uint32_t id)
 {
-       conference_member_t *member = NULL;
+    conference_member_t *member = NULL;
 
-       switch_assert(conference != NULL);
-       if (!id) {
-               return NULL;
-       }
+    switch_assert(conference != NULL);
+    if (!id) {
+        return NULL;
+    }
 
-       switch_mutex_lock(conference->member_mutex);
-       for (member = conference->members; member; member = member->next) {
+    switch_mutex_lock(conference->member_mutex);
+    for (member = conference->members; member; member = member->next) {
 
-               if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
-                       continue;
-               }
+        if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
+            continue;
+        }
 
-               if (member->id == id) {
-                       break;
-               }
-       }
+        if (member->id == id) {
+            break;
+        }
+    }
 
-       if (member && !switch_test_flag(member, MFLAG_INTREE)) {
-               member = NULL;
-       }
+    if (member && !switch_test_flag(member, MFLAG_INTREE)) {
+        member = NULL;
+    }
 
-       switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(conference->member_mutex);
 
-       return member;
+    return member;
 }
 
 /* stop the specified recording */
 static switch_status_t conference_record_stop(conference_obj_t *conference, char *path)
 {
-       conference_member_t *member = NULL;
-       int count = 0;
-
-       switch_assert(conference != NULL);
-       switch_mutex_lock(conference->member_mutex);
-       for (member = conference->members; member; member = member->next) {
-               if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) {
-                       switch_clear_flag_locked(member, MFLAG_RUNNING);
-                       count++;
-               }
-       }
-       switch_mutex_unlock(conference->member_mutex);
-       return count;
+    conference_member_t *member = NULL;
+    int count = 0;
+
+    switch_assert(conference != NULL);
+    switch_mutex_lock(conference->member_mutex);
+    for (member = conference->members; member; member = member->next) {
+        if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) {
+            switch_clear_flag_locked(member, MFLAG_RUNNING);
+            count++;
+        }
+    }
+    switch_mutex_unlock(conference->member_mutex);
+    return count;
 }
 
 /* Add a custom relationship to a member */
 static conference_relationship_t *member_add_relationship(conference_member_t *member, uint32_t id)
 {
-       conference_relationship_t *rel = NULL;
+    conference_relationship_t *rel = NULL;
 
-       if (member == NULL || id == 0 || !(rel = switch_core_alloc(member->pool, sizeof(*rel))))
-               return NULL;
+    if (member == NULL || id == 0 || !(rel = switch_core_alloc(member->pool, sizeof(*rel))))
+        return NULL;
 
-       rel->id = id;
+    rel->id = id;
 
-       switch_mutex_lock(member->flag_mutex);
-       rel->next = member->relationships;
-       member->relationships = rel;
-       switch_mutex_unlock(member->flag_mutex);
+    switch_mutex_lock(member->flag_mutex);
+    rel->next = member->relationships;
+    member->relationships = rel;
+    switch_mutex_unlock(member->flag_mutex);
 
-       return rel;
+    return rel;
 }
 
 /* Remove a custom relationship from a member */
 static switch_status_t member_del_relationship(conference_member_t *member, uint32_t id)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       conference_relationship_t *rel, *last = NULL;
-
-       if (member == NULL || id == 0)
-               return status;
-
-       switch_mutex_lock(member->flag_mutex);
-       for (rel = member->relationships; rel; rel = rel->next) {
-               if (rel->id == id) {
-                       /* we just forget about rel here cos it was allocated by the member's pool 
-                          it will be freed when the member is */
-                       status = SWITCH_STATUS_SUCCESS;
-                       if (last) {
-                               last->next = rel->next;
-                       } else {
-                               member->relationships = rel->next;
-                       }
-               }
-               last = rel;
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    conference_relationship_t *rel, *last = NULL;
+
+    if (member == NULL || id == 0)
+        return status;
+
+    switch_mutex_lock(member->flag_mutex);
+    for (rel = member->relationships; rel; rel = rel->next) {
+        if (rel->id == id) {
+            /* we just forget about rel here cos it was allocated by the member's pool 
+               it will be freed when the member is */
+            status = SWITCH_STATUS_SUCCESS;
+            if (last) {
+                last->next = rel->next;
+            } else {
+                member->relationships = rel->next;
+            }
+        }
+        last = rel;
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    return status;
 }
 
 /* Gain exclusive access and add the member to the list */
 static switch_status_t conference_add_member(conference_obj_t *conference, conference_member_t *member)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       switch_event_t *event;
-       char msg[512];                          /* conference count announcement */
-       call_list_t *call_list = NULL;
-       switch_channel_t *channel;
-
-       switch_assert(conference != NULL);
-       switch_assert(member != NULL);
-
-       switch_mutex_lock(conference->mutex);
-       switch_mutex_lock(member->audio_in_mutex);
-       switch_mutex_lock(member->audio_out_mutex);
-       switch_mutex_lock(member->flag_mutex);
-       switch_mutex_lock(conference->member_mutex);
-
-       switch_clear_flag(conference, CFLAG_DESTRUCT);
-       member->conference = conference;
-       member->next = conference->members;
-       member->energy_level = conference->energy_level;
-       conference->members = member;
-       switch_set_flag(member, MFLAG_INTREE);
-       switch_mutex_unlock(conference->member_mutex);
-
-       if (!switch_test_flag(member, MFLAG_NOCHANNEL)) {
-               conference->count++;
-               if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
-                       switch_event_fire(&event);
-               }
-
-               if (conference->count > 1) {
-                       if (conference->moh_sound) {
-                               /* stop MoH if any */
-                               conference_stop_file(conference, FILE_STOP_ASYNC);
-                       }
-                       if (conference->enter_sound) {
-                               conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
-                       }
-               }
-
-               channel = switch_core_session_get_channel(member->session);
-               call_list = (call_list_t *) switch_channel_get_private(channel, "_conference_autocall_list_");
-
-               if (call_list) {
-                       char saymsg[1024];
-                       switch_snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->itteration);
-                       conference_member_say(member, saymsg, 0);
-               } else {
-                       if (switch_strlen_zero(conference->special_announce)) {
-                               /* announce the total number of members in the conference */
-                               if (conference->count >= conference->announce_count && conference->announce_count > 1) {
-                                       switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
-                                       conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
-                               } else if (conference->count == 1 && !conference->perpetual_sound) {
-                                       if (conference->alone_sound) {
-                                               conference_stop_file(conference, FILE_STOP_ASYNC);
-                                               conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
-                                       } else {
-                                               switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference.");
-                                               conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
-                                       }
-                               }
-                       }
-               }
-
-               if (conference->count == 1) {
-                       conference->floor_holder = member;
-               }
-
-               if (conference->min && conference->count >= conference->min) {
-                       switch_set_flag(conference, CFLAG_ENFORCE_MIN);
-               }
-
-               if (test_eflag(conference, EFLAG_ADD_MEMBER) &&
-                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                       conference_add_event_member_data(member, event);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "add-member");
-                       switch_event_fire(&event);
-               }
-
-       }
-       switch_mutex_unlock(member->flag_mutex);
-       switch_mutex_unlock(member->audio_out_mutex);
-       switch_mutex_unlock(member->audio_in_mutex);
-
-       switch_mutex_unlock(conference->mutex);
-       status = SWITCH_STATUS_SUCCESS;
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    switch_event_t *event;
+    char msg[512];              /* conference count announcement */
+    call_list_t *call_list = NULL;
+    switch_channel_t *channel;
+
+    switch_assert(conference != NULL);
+    switch_assert(member != NULL);
+
+    switch_mutex_lock(conference->mutex);
+    switch_mutex_lock(member->audio_in_mutex);
+    switch_mutex_lock(member->audio_out_mutex);
+    switch_mutex_lock(member->flag_mutex);
+    switch_mutex_lock(conference->member_mutex);
+
+    switch_clear_flag(conference, CFLAG_DESTRUCT);
+    member->conference = conference;
+    member->next = conference->members;
+    member->energy_level = conference->energy_level;
+    conference->members = member;
+    switch_set_flag(member, MFLAG_INTREE);
+    switch_mutex_unlock(conference->member_mutex);
+
+    if (!switch_test_flag(member, MFLAG_NOCHANNEL)) {
+        conference->count++;
+        if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
+            switch_event_fire(&event);
+        }
+
+        if (conference->count > 1) {
+            if (conference->moh_sound) {
+                /* stop MoH if any */
+                conference_stop_file(conference, FILE_STOP_ASYNC);
+            }
+            if (conference->enter_sound) {
+                conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
+            }
+        }
+
+        channel = switch_core_session_get_channel(member->session);
+        call_list = (call_list_t *) switch_channel_get_private(channel, "_conference_autocall_list_");
+
+        if (call_list) {
+            char saymsg[1024];
+            switch_snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->itteration);
+            conference_member_say(member, saymsg, 0);
+        } else {
+            if (switch_strlen_zero(conference->special_announce)) {
+                /* announce the total number of members in the conference */
+                if (conference->count >= conference->announce_count && conference->announce_count > 1) {
+                    switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
+                    conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
+                } else if (conference->count == 1 && !conference->perpetual_sound) {
+                    if (conference->alone_sound) {
+                        conference_stop_file(conference, FILE_STOP_ASYNC);
+                        conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
+                    } else {
+                        switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference.");
+                        conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
+                    }
+                }
+            }
+        }
+
+        if (conference->count == 1) {
+            conference->floor_holder = member;
+        }
+
+        if (conference->min && conference->count >= conference->min) {
+            switch_set_flag(conference, CFLAG_ENFORCE_MIN);
+        }
+
+        if (test_eflag(conference, EFLAG_ADD_MEMBER) &&
+            switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+            conference_add_event_member_data(member, event);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "add-member");
+            switch_event_fire(&event);
+        }
+
+    }
+    switch_mutex_unlock(member->flag_mutex);
+    switch_mutex_unlock(member->audio_out_mutex);
+    switch_mutex_unlock(member->audio_in_mutex);
+
+    switch_mutex_unlock(conference->mutex);
+    status = SWITCH_STATUS_SUCCESS;
+
+    return status;
 }
 
 /* Gain exclusive access and remove the member from the list */
 static switch_status_t conference_del_member(conference_obj_t *conference, conference_member_t *member)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       conference_member_t *imember, *last = NULL;
-       switch_event_t *event;
-
-       switch_assert(conference != NULL);
-       switch_assert(member != NULL);
-
-       switch_mutex_lock(conference->mutex);
-       switch_mutex_lock(conference->member_mutex);
-       switch_mutex_lock(member->audio_in_mutex);
-       switch_mutex_lock(member->audio_out_mutex);
-       switch_mutex_lock(member->flag_mutex);
-       switch_clear_flag(member, MFLAG_INTREE);
-
-       for (imember = conference->members; imember; imember = imember->next) {
-               if (imember == member) {
-                       if (last) {
-                               last->next = imember->next;
-                       } else {
-                               conference->members = imember->next;
-                       }
-                       break;
-               }
-               last = imember;
-       }
-
-       /* Close Unused Handles */
-       if (member->fnode) {
-               conference_file_node_t *fnode, *cur;
-               switch_memory_pool_t *pool;
-
-               fnode = member->fnode;
-               while (fnode) {
-                       cur = fnode;
-                       fnode = fnode->next;
-
-                       if (cur->type != NODE_TYPE_SPEECH) {
-                               switch_core_file_close(&cur->fh);
-                       }
-
-                       pool = cur->pool;
-                       switch_core_destroy_memory_pool(&pool);
-               }
-       }
-
-       if (member->sh) {
-               switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-               switch_core_speech_close(&member->lsh, &flags);
-               member->sh = NULL;
-       }
-
-       if (switch_test_flag(member, MFLAG_ENDCONF)) {
-               switch_set_flag_locked(member->conference, CFLAG_DESTRUCT);
-       }
-
-       if (member == member->conference->floor_holder) {
-               member->conference->floor_holder = NULL;
-       }
-
-       member->conference = NULL;
-
-       if (!switch_test_flag(member, MFLAG_NOCHANNEL)) {
-               conference->count--;
-               if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
-                       switch_event_fire(&event);
-               }
-
-               if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min)
-                       || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0)) {
-                       switch_set_flag(conference, CFLAG_DESTRUCT);
-               } else {
-                       if (conference->exit_sound) {
-                               conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session), 0);
-                       }
-                       if (conference->count == 1 && conference->alone_sound) {
-                               conference_stop_file(conference, FILE_STOP_ASYNC);
-                               conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session), 1);
-                       }
-               }
-
-               if (conference->announce_count == 1) {
-                       conference->floor_holder = conference->members;
-               }
-
-               if (test_eflag(conference, EFLAG_DEL_MEMBER) &&
-                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                       conference_add_event_member_data(member, event);
-                       conference_add_event_data(conference, event);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "del-member");
-                       switch_event_fire(&event);
-               }
-       }
-       switch_mutex_unlock(conference->member_mutex);
-       switch_mutex_unlock(member->flag_mutex);
-       switch_mutex_unlock(member->audio_out_mutex);
-       switch_mutex_unlock(member->audio_in_mutex);
-       switch_mutex_unlock(conference->mutex);
-       status = SWITCH_STATUS_SUCCESS;
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    conference_member_t *imember, *last = NULL;
+    switch_event_t *event;
+
+    switch_assert(conference != NULL);
+    switch_assert(member != NULL);
+
+    switch_mutex_lock(conference->mutex);
+    switch_mutex_lock(conference->member_mutex);
+    switch_mutex_lock(member->audio_in_mutex);
+    switch_mutex_lock(member->audio_out_mutex);
+    switch_mutex_lock(member->flag_mutex);
+    switch_clear_flag(member, MFLAG_INTREE);
+
+    for (imember = conference->members; imember; imember = imember->next) {
+        if (imember == member) {
+            if (last) {
+                last->next = imember->next;
+            } else {
+                conference->members = imember->next;
+            }
+            break;
+        }
+        last = imember;
+    }
+
+    /* Close Unused Handles */
+    if (member->fnode) {
+        conference_file_node_t *fnode, *cur;
+        switch_memory_pool_t *pool;
+
+        fnode = member->fnode;
+        while (fnode) {
+            cur = fnode;
+            fnode = fnode->next;
+
+            if (cur->type != NODE_TYPE_SPEECH) {
+                switch_core_file_close(&cur->fh);
+            }
+
+            pool = cur->pool;
+            switch_core_destroy_memory_pool(&pool);
+        }
+    }
+
+    if (member->sh) {
+        switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
+        switch_core_speech_close(&member->lsh, &flags);
+        member->sh = NULL;
+    }
+
+    if (switch_test_flag(member, MFLAG_ENDCONF)) {
+        switch_set_flag_locked(member->conference, CFLAG_DESTRUCT);
+    }
+
+    if (member == member->conference->floor_holder) {
+        member->conference->floor_holder = NULL;
+    }
+
+    member->conference = NULL;
+
+    if (!switch_test_flag(member, MFLAG_NOCHANNEL)) {
+        conference->count--;
+        if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
+            switch_event_fire(&event);
+        }
+
+        if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min)
+            || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0)) {
+            switch_set_flag(conference, CFLAG_DESTRUCT);
+        } else {
+            if (conference->exit_sound) {
+                conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session), 0);
+            }
+            if (conference->count == 1 && conference->alone_sound) {
+                conference_stop_file(conference, FILE_STOP_ASYNC);
+                conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session), 1);
+            }
+        }
+
+        if (conference->announce_count == 1) {
+            conference->floor_holder = conference->members;
+        }
+
+        if (test_eflag(conference, EFLAG_DEL_MEMBER) &&
+            switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+            conference_add_event_member_data(member, event);
+            conference_add_event_data(conference, event);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "del-member");
+            switch_event_fire(&event);
+        }
+    }
+    switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(member->flag_mutex);
+    switch_mutex_unlock(member->audio_out_mutex);
+    switch_mutex_unlock(member->audio_in_mutex);
+    switch_mutex_unlock(conference->mutex);
+    status = SWITCH_STATUS_SUCCESS;
+
+    return status;
 }
 
 /* Main video monitor thread (1 per distinct conference room) */
 static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thread, void *obj)
 {
-       conference_obj_t *conference = (conference_obj_t *) obj;
-       conference_member_t *imember, *last_member = NULL;
-       switch_frame_t *vid_frame;
-       switch_status_t status;
-       int has_vid = 1, req_iframe = 0;
-
-       conference->video_running = 1;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name);
-
-       while (has_vid && conference->video_running == 1 && globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
-               if (!conference->floor_holder) {
-                       switch_yield(100000);
-                       continue;
-               }
-
-               if (switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) {
-                       status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
-
-                       if (!SWITCH_READ_ACCEPTABLE(status)) {
-                               conference->floor_holder = NULL;
-                               req_iframe = 0;
-                               continue;
-                       }
-
-                       if (switch_test_flag(vid_frame, SFF_CNG)) {
-                               continue;
-                       }
-
-                       if (conference->floor_holder != last_member) {
-                               int iframe = 0;
+    conference_obj_t *conference = (conference_obj_t *) obj;
+    conference_member_t *imember, *last_member = NULL;
+    switch_frame_t *vid_frame;
+    switch_status_t status;
+    int has_vid = 1, req_iframe = 0;
+
+    conference->video_running = 1;
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name);
+
+    while (has_vid && conference->video_running == 1 && globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
+        if (!conference->floor_holder) {
+            switch_yield(100000);
+            continue;
+        }
+
+        if (switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) {
+            status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
+
+            if (!SWITCH_READ_ACCEPTABLE(status)) {
+                conference->floor_holder = NULL;
+                req_iframe = 0;
+                continue;
+            }
+
+            if (switch_test_flag(vid_frame, SFF_CNG)) {
+                continue;
+            }
+
+            if (conference->floor_holder != last_member) {
+                int iframe = 0;
 #if 0
-                               switch_core_session_message_t msg = { 0 };
+                switch_core_session_message_t msg = { 0 };
 
 
-                               if (!req_iframe) {
-                                       /* Tell the channel to request a fresh vid frame */
-                                       msg.from = __FILE__;
-                                       msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ;
-                                       switch_core_session_receive_message(conference->floor_holder->session, &msg);
-                                       req_iframe = 1;
-                               }
+                if (!req_iframe) {
+                    /* Tell the channel to request a fresh vid frame */
+                    msg.from = __FILE__;
+                    msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ;
+                    switch_core_session_receive_message(conference->floor_holder->session, &msg);
+                    req_iframe = 1;
+                }
 #endif
 
-                               if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */
-                                       iframe = (*((int16_t *) vid_frame->data) >> 12 == 6);
-                               } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */
-                                       int y = *((int8_t *) vid_frame->data + 2) & 0xfe;
-                                       iframe = (y == 0x80 || y == 0x82);
-                               } else if (vid_frame->codec->implementation->ianacode == 99) {  /* h.264 */
-                                       iframe = (*((int16_t *) vid_frame->data) >> 5 == 0x11);
-                               } else {                /* we need more defs */
-                                       iframe = 1;
-                               }
-
-                               if (!iframe) {
-                                       continue;
-                               }
-
-                               req_iframe = 0;
-                       }
-
-                       last_member = conference->floor_holder;
-
-                       switch_mutex_lock(conference->member_mutex);
-                       has_vid = 0;
-                       for (imember = conference->members; imember; imember = imember->next) {
-                               if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
-                                       has_vid++;
-                                       switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
-                               }
-                       }
-                       switch_mutex_unlock(conference->member_mutex);
-               }
-       }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread ending for conference %s\n", conference->name);
-       conference->video_running = 0;
-
-       return NULL;
+                if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */
+                    iframe = (*((int16_t *) vid_frame->data) >> 12 == 6);
+                } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */
+                    int y = *((int8_t *) vid_frame->data + 2) & 0xfe;
+                    iframe = (y == 0x80 || y == 0x82);
+                } else if (vid_frame->codec->implementation->ianacode == 99) {  /* h.264 */
+                    iframe = (*((int16_t *) vid_frame->data) >> 5 == 0x11);
+                } else {        /* we need more defs */
+                    iframe = 1;
+                }
+
+                if (!iframe) {
+                    continue;
+                }
+
+                req_iframe = 0;
+            }
+
+            last_member = conference->floor_holder;
+
+            switch_mutex_lock(conference->member_mutex);
+            has_vid = 0;
+            for (imember = conference->members; imember; imember = imember->next) {
+                if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
+                    has_vid++;
+                    switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
+                }
+            }
+            switch_mutex_unlock(conference->member_mutex);
+        }
+    }
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread ending for conference %s\n", conference->name);
+    conference->video_running = 0;
+
+    return NULL;
+}
+
+/* Create a video thread for the conference and launch it */
+static void launch_conference_video_thread(conference_obj_t *conference)
+{
+    switch_thread_t *thread;
+    switch_threadattr_t *thd_attr = NULL;
+
+    switch_threadattr_create(&thd_attr, conference->pool);
+    switch_threadattr_detach_set(thd_attr, 1);
+    switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+    switch_thread_create(&thread, thd_attr, conference_video_thread_run, conference, conference->pool);
 }
 
 /* Main monitor thread (1 per distinct conference room) */
 static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *obj)
 {
-       conference_obj_t *conference = (conference_obj_t *) obj;
-       conference_member_t *imember, *omember;
-       uint32_t samples = switch_samples_per_packet(conference->rate, conference->interval);
-       uint32_t bytes = samples * 2;
-       uint8_t ready = 0, total = 0;
-       switch_timer_t timer = { 0 };
-       switch_event_t *event;
-       uint8_t *file_frame;
-       uint8_t *async_file_frame;
-
-       file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
-       async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
-
-       if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, conference->pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success interval: %u  samples: %u\n", conference->interval, samples);
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
-               return NULL;
-       }
-
-       switch_mutex_lock(globals.hash_mutex);
-       globals.threads++;
-       switch_mutex_unlock(globals.hash_mutex);
-       
-       if (conference->auto_record) {
-               imember = conference->members;
-               if (imember) {
-                       switch_channel_t *channel = switch_core_session_get_channel(imember->session);
-                       char *rfile = switch_channel_expand_variables(channel, conference->auto_record); 
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Auto recording file: %s\n", rfile);
-                       launch_conference_record_thread(conference, rfile);
-                       if (rfile != conference->auto_record) {
-                               switch_safe_free(rfile);
-                       }
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Auto Record Failed.  No members in conference.\n");
-               }
-       }
-
-       while (globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
-               switch_size_t file_sample_len = samples;
-               switch_size_t file_data_len = samples * 2;
-               int has_file_data = 0, members_with_video = 0;
-
-               if (conference->perpetual_sound && !conference->async_fnode) {
-                       conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 1);
-               } else if (conference->moh_sound && conference->count == 1 && !conference->async_fnode) {
-                       conference_play_file(conference, conference->moh_sound, CONF_DEFAULT_LEADIN, NULL, 1);
-               }
-
-               /* Sync the conference to a single timing source */
-               if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
-                       switch_set_flag(conference, CFLAG_DESTRUCT);
-                       break;
-               }
-
-               switch_mutex_lock(conference->mutex);
-               has_file_data = ready = total = 0;
-
-               /* Read one frame of audio from each member channel and save it for redistribution */
-               for (imember = conference->members; imember; imember = imember->next) {
-                       uint32_t buf_read = 0;
-                       total++;
-                       imember->read = 0;
-
-                       if (imember->session && switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
-                               members_with_video++;
-                       }
-
-                       switch_clear_flag_locked(imember, MFLAG_HAS_AUDIO);
-                       switch_mutex_lock(imember->audio_in_mutex);
-
-                       if (switch_buffer_inuse(imember->audio_buffer) >= bytes
-                               && (buf_read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, bytes))) {
-                               imember->read = buf_read;
-                               switch_set_flag_locked(imember, MFLAG_HAS_AUDIO);
-                               ready++;
-                       }
-                       switch_mutex_unlock(imember->audio_in_mutex);
-               }
-
-               if (members_with_video && conference->video_running != 1) {
-                       launch_conference_video_thread(conference);
-               }
-
-               /* If a file or speech event is being played */
-               if (conference->fnode) {
-                       /* Lead in time */
-                       if (conference->fnode->leadin) {
-                               conference->fnode->leadin--;
-                       } else if (!conference->fnode->done) {
-                               file_sample_len = samples;
-                               if (conference->fnode->type == NODE_TYPE_SPEECH) {
-                                       switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING;
-                                       uint32_t rate = conference->rate;
-
-                                       if (switch_core_speech_read_tts(conference->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) {
-                                               file_sample_len = file_data_len / 2;
-                                       } else {
-                                               file_sample_len = file_data_len = 0;
-                                       }
-                               } else if (conference->fnode->type == NODE_TYPE_FILE) {
-                                       switch_core_file_read(&conference->fnode->fh, file_frame, &file_sample_len);
-                               }
-
-                               if (file_sample_len <= 0) {
-                                       conference->fnode->done++;
-                               } else {
-                                       has_file_data = 1;
-                               }
-                       }
-               }
-
-               if (conference->async_fnode) {
-                       /* Lead in time */
-                       if (conference->async_fnode->leadin) {
-                               conference->async_fnode->leadin--;
-                       } else if (!conference->async_fnode->done) {
-                               file_sample_len = samples;
-                               switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len);
-
-                               if (file_sample_len <= 0) {
-                                       conference->async_fnode->done++;
-                               } else {
-                                       if (has_file_data) {
-                                               switch_size_t x;
-
-                                               for (x = 0; x < file_sample_len; x++) {
-                                                       int32_t z;
-                                                       int16_t *bptr, *muxed;
-
-                                                       muxed = (int16_t *) file_frame;
-                                                       bptr = (int16_t *) async_file_frame;
-                                                       z = muxed[x] + bptr[x];
-                                                       switch_normalize_to_16bit(z);
-                                                       muxed[x] = (int16_t) z;
-                                               }
-                                       } else {
-                                               memcpy(file_frame, async_file_frame, file_sample_len * 2);
-                                               has_file_data = 1;
-                                       }
-                               }
-                       }
-               }
-
-               if (ready || has_file_data) {
-                       /* Build a muxed frame for every member that contains the mixed audio of everyone else */
-
-                       for (omember = conference->members; omember; omember = omember->next) {
-                               if (has_file_data && file_sample_len) {
-                                       uint32_t sample_bytes = file_sample_len * 2;
-                                       memcpy(omember->mux_frame, file_frame, sample_bytes);
-                                       if (sample_bytes < bytes) {
-                                               if (conference->comfort_noise_level) {
-                                                       switch_generate_sln_silence((int16_t *) omember->mux_frame + sample_bytes,
-                                                                                                               (bytes - sample_bytes) / 2, conference->comfort_noise_level);
-                                               } else {
-                                                       memset(omember->mux_frame + sample_bytes, 255, bytes - sample_bytes);
-                                               }
-                                       }
-                               } else {
-                                       if (conference->comfort_noise_level) {
-                                               switch_generate_sln_silence((int16_t *) omember->mux_frame, bytes / 2, conference->comfort_noise_level);
-                                       } else {
-                                               memset(omember->mux_frame, 255, bytes);
-                                       }
-                               }
-                               for (imember = conference->members; imember; imember = imember->next) {
-                                       uint32_t x;
-                                       int16_t *bptr, *muxed;
-
-                                       if (imember == omember || !imember->read) {
-                                               /* Don't add audio from yourself or if you didn't read any */
-                                               continue;
-                                       }
-
-                                       /* If they are not supposed to talk to us then don't let them */
-                                       if (omember->relationships) {
-                                               conference_relationship_t *rel;
-
-                                               if ((rel = member_get_relationship(omember, imember))) {
-                                                       if (!switch_test_flag(rel, RFLAG_CAN_HEAR)) {
-                                                               continue;
-                                                       }
-                                               }
-                                       }
-
-                                       /* If we are not supposed to hear them then don't let it happen */
-                                       if (imember->relationships) {
-                                               conference_relationship_t *rel;
-
-                                               if ((rel = member_get_relationship(imember, omember))) {
-                                                       if (!switch_test_flag(rel, RFLAG_CAN_SPEAK)) {
-                                                               continue;
-                                                       }
-                                               }
-                                       }
+    conference_obj_t *conference = (conference_obj_t *) obj;
+    conference_member_t *imember, *omember;
+    uint32_t samples = switch_samples_per_packet(conference->rate, conference->interval);
+    uint32_t bytes = samples * 2;
+    uint8_t ready = 0, total = 0;
+    switch_timer_t timer = { 0 };
+    switch_event_t *event;
+    uint8_t *file_frame;
+    uint8_t *async_file_frame;
+
+    file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
+    async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
+
+    if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, conference->pool) == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success interval: %u  samples: %u\n", conference->interval, samples);
+    } else {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
+        return NULL;
+    }
+
+    switch_mutex_lock(globals.hash_mutex);
+    globals.threads++;
+    switch_mutex_unlock(globals.hash_mutex);
+    
+    if (conference->auto_record) {
+        imember = conference->members;
+        if (imember) {
+            switch_channel_t *channel = switch_core_session_get_channel(imember->session);
+            char *rfile = switch_channel_expand_variables(channel, conference->auto_record); 
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Auto recording file: %s\n", rfile);
+            launch_conference_record_thread(conference, rfile);
+            if (rfile != conference->auto_record) {
+                switch_safe_free(rfile);
+            }
+        } else {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Auto Record Failed.  No members in conference.\n");
+        }
+    }
+
+    while (globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
+        switch_size_t file_sample_len = samples;
+        switch_size_t file_data_len = samples * 2;
+        int has_file_data = 0, members_with_video = 0;
+
+        if (conference->perpetual_sound && !conference->async_fnode) {
+            conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 1);
+        } else if (conference->moh_sound && conference->count == 1 && !conference->async_fnode) {
+            conference_play_file(conference, conference->moh_sound, CONF_DEFAULT_LEADIN, NULL, 1);
+        }
+
+        /* Sync the conference to a single timing source */
+        if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
+            switch_set_flag(conference, CFLAG_DESTRUCT);
+            break;
+        }
+
+        switch_mutex_lock(conference->mutex);
+        has_file_data = ready = total = 0;
+
+        /* Read one frame of audio from each member channel and save it for redistribution */
+        for (imember = conference->members; imember; imember = imember->next) {
+            uint32_t buf_read = 0;
+            total++;
+            imember->read = 0;
+
+            if (imember->session && switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
+                members_with_video++;
+            }
+
+            switch_clear_flag_locked(imember, MFLAG_HAS_AUDIO);
+            switch_mutex_lock(imember->audio_in_mutex);
+
+            if (switch_buffer_inuse(imember->audio_buffer) >= bytes
+                && (buf_read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, bytes))) {
+                imember->read = buf_read;
+                switch_set_flag_locked(imember, MFLAG_HAS_AUDIO);
+                ready++;
+            }
+            switch_mutex_unlock(imember->audio_in_mutex);
+        }
+
+        if (members_with_video && conference->video_running != 1) {
+            launch_conference_video_thread(conference);
+        }
+
+        /* If a file or speech event is being played */
+        if (conference->fnode) {
+            /* Lead in time */
+            if (conference->fnode->leadin) {
+                conference->fnode->leadin--;
+            } else if (!conference->fnode->done) {
+                file_sample_len = samples;
+                if (conference->fnode->type == NODE_TYPE_SPEECH) {
+                    switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING;
+                    uint32_t rate = conference->rate;
+
+                    if (switch_core_speech_read_tts(conference->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) {
+                        file_sample_len = file_data_len / 2;
+                    } else {
+                        file_sample_len = file_data_len = 0;
+                    }
+                } else if (conference->fnode->type == NODE_TYPE_FILE) {
+                    switch_core_file_read(&conference->fnode->fh, file_frame, &file_sample_len);
+                }
+
+                if (file_sample_len <= 0) {
+                    conference->fnode->done++;
+                } else {
+                    has_file_data = 1;
+                }
+            }
+        }
+
+        if (conference->async_fnode) {
+            /* Lead in time */
+            if (conference->async_fnode->leadin) {
+                conference->async_fnode->leadin--;
+            } else if (!conference->async_fnode->done) {
+                file_sample_len = samples;
+                switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len);
+
+                if (file_sample_len <= 0) {
+                    conference->async_fnode->done++;
+                } else {
+                    if (has_file_data) {
+                        switch_size_t x;
+
+                        for (x = 0; x < file_sample_len; x++) {
+                            int32_t z;
+                            int16_t *bptr, *muxed;
+
+                            muxed = (int16_t *) file_frame;
+                            bptr = (int16_t *) async_file_frame;
+                            z = muxed[x] + bptr[x];
+                            switch_normalize_to_16bit(z);
+                            muxed[x] = (int16_t) z;
+                        }
+                    } else {
+                        memcpy(file_frame, async_file_frame, file_sample_len * 2);
+                        has_file_data = 1;
+                    }
+                }
+            }
+        }
+
+        if (ready || has_file_data) {
+            /* Build a muxed frame for every member that contains the mixed audio of everyone else */
+
+            for (omember = conference->members; omember; omember = omember->next) {
+                if (has_file_data && file_sample_len) {
+                    uint32_t sample_bytes = file_sample_len * 2;
+                    memcpy(omember->mux_frame, file_frame, sample_bytes);
+                    if (sample_bytes < bytes) {
+                        if (conference->comfort_noise_level) {
+                            switch_generate_sln_silence((int16_t *) omember->mux_frame + sample_bytes,
+                                                        (bytes - sample_bytes) / 2, conference->comfort_noise_level);
+                        } else {
+                            memset(omember->mux_frame + sample_bytes, 255, bytes - sample_bytes);
+                        }
+                    }
+                } else {
+                    if (conference->comfort_noise_level) {
+                        switch_generate_sln_silence((int16_t *) omember->mux_frame, bytes / 2, conference->comfort_noise_level);
+                    } else {
+                        memset(omember->mux_frame, 255, bytes);
+                    }
+                }
+                for (imember = conference->members; imember; imember = imember->next) {
+                    uint32_t x;
+                    int16_t *bptr, *muxed;
+
+                    if (imember == omember || !imember->read) {
+                        /* Don't add audio from yourself or if you didn't read any */
+                        continue;
+                    }
+
+                    /* If they are not supposed to talk to us then don't let them */
+                    if (omember->relationships) {
+                        conference_relationship_t *rel;
+
+                        if ((rel = member_get_relationship(omember, imember))) {
+                            if (!switch_test_flag(rel, RFLAG_CAN_HEAR)) {
+                                continue;
+                            }
+                        }
+                    }
+
+                    /* If we are not supposed to hear them then don't let it happen */
+                    if (imember->relationships) {
+                        conference_relationship_t *rel;
+
+                        if ((rel = member_get_relationship(imember, omember))) {
+                            if (!switch_test_flag(rel, RFLAG_CAN_SPEAK)) {
+                                continue;
+                            }
+                        }
+                    }
 #if 0
-                                       if (nt && conference->not_talking_buf_len && !switch_test_flag(omember, MFLAG_HAS_AUDIO)) {
-                                               memcpy(omember->mux_frame, conference->not_talking_buf, conference->not_talking_buf_len);
-                                               continue;
-                                       }
+                    if (nt && conference->not_talking_buf_len && !switch_test_flag(omember, MFLAG_HAS_AUDIO)) {
+                        memcpy(omember->mux_frame, conference->not_talking_buf, conference->not_talking_buf_len);
+                        continue;
+                    }
 #endif
-                                       bptr = (int16_t *) imember->frame;
-                                       muxed = (int16_t *) omember->mux_frame;
-
-                                       for (x = 0; x < imember->read / 2; x++) {
-                                               int32_t z = muxed[x] + bptr[x];
-                                               switch_normalize_to_16bit(z);
-                                               muxed[x] = (int16_t) z;
-                                       }
+                    bptr = (int16_t *) imember->frame;
+                    muxed = (int16_t *) omember->mux_frame;
+
+                    for (x = 0; x < imember->read / 2; x++) {
+                        int32_t z = muxed[x] + bptr[x];
+                        switch_normalize_to_16bit(z);
+                        muxed[x] = (int16_t) z;
+                    }
 #if 0
-                                       if (total - ready > 1) {
-                                               conference->not_talking_buf_len = imember->read;
-                                               if (!conference->not_talking_buf) {
-                                                       conference->not_talking_buf = switch_core_alloc(conference->pool, imember->read + 128);
-                                               }
-                                               memcpy(conference->not_talking_buf, muxed, conference->not_talking_buf_len);
-                                               nt++;
-                                       }
+                    if (total - ready > 1) {
+                        conference->not_talking_buf_len = imember->read;
+                        if (!conference->not_talking_buf) {
+                            conference->not_talking_buf = switch_core_alloc(conference->pool, imember->read + 128);
+                        }
+                        memcpy(conference->not_talking_buf, muxed, conference->not_talking_buf_len);
+                        nt++;
+                    }
 #endif
-                               }
-                       }
-                       if (bytes) {
-                               /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */
-                               for (imember = conference->members; imember; imember = imember->next) {
-                                       if (switch_test_flag(imember, MFLAG_RUNNING)) {
-                                               switch_size_t ok = 1;
-                                               switch_mutex_lock(imember->audio_out_mutex);
-                                               ok = switch_buffer_write(imember->mux_buffer, imember->mux_frame, bytes);
-                                               switch_mutex_unlock(imember->audio_out_mutex);
-                                               if (!ok) {
-                                                       goto end;
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (conference->async_fnode && conference->async_fnode->done) {
-                       switch_memory_pool_t *pool;
-                       switch_core_file_close(&conference->async_fnode->fh);
-                       pool = conference->async_fnode->pool;
-                       conference->async_fnode = NULL;
-                       switch_core_destroy_memory_pool(&pool);
-               }
-
-               if (conference->fnode && conference->fnode->done) {
-                       conference_file_node_t *fnode;
-                       switch_memory_pool_t *pool;
-
-                       if (conference->fnode->type != NODE_TYPE_SPEECH) {
-                               switch_core_file_close(&conference->fnode->fh);
-                       }
-
-                       fnode = conference->fnode;
-                       conference->fnode = conference->fnode->next;
-
-                       pool = fnode->pool;
-                       fnode = NULL;
-                       switch_core_destroy_memory_pool(&pool);
-               }
-
-               switch_mutex_unlock(conference->mutex);
-       }
-       /* Rinse ... Repeat */
+                }
+            }
+            if (bytes) {
+                /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */
+                for (imember = conference->members; imember; imember = imember->next) {
+                    if (switch_test_flag(imember, MFLAG_RUNNING)) {
+                        switch_size_t ok = 1;
+                        switch_mutex_lock(imember->audio_out_mutex);
+                        ok = switch_buffer_write(imember->mux_buffer, imember->mux_frame, bytes);
+                        switch_mutex_unlock(imember->audio_out_mutex);
+                        if (!ok) {
+                            goto end;
+                        }
+                    }
+                }
+            }
+        }
+        if (conference->async_fnode && conference->async_fnode->done) {
+            switch_memory_pool_t *pool;
+            switch_core_file_close(&conference->async_fnode->fh);
+            pool = conference->async_fnode->pool;
+            conference->async_fnode = NULL;
+            switch_core_destroy_memory_pool(&pool);
+        }
+
+        if (conference->fnode && conference->fnode->done) {
+            conference_file_node_t *fnode;
+            switch_memory_pool_t *pool;
+
+            if (conference->fnode->type != NODE_TYPE_SPEECH) {
+                switch_core_file_close(&conference->fnode->fh);
+            }
+
+            fnode = conference->fnode;
+            conference->fnode = conference->fnode->next;
+
+            pool = fnode->pool;
+            fnode = NULL;
+            switch_core_destroy_memory_pool(&pool);
+        }
+
+        switch_mutex_unlock(conference->mutex);
+    }
+    /* Rinse ... Repeat */
  end:
 
-       if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "Inactive");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "terminated");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", "inbound");
-               switch_event_fire(&event);
-       }
-
-       switch_mutex_lock(conference->mutex);
-       conference_stop_file(conference, FILE_STOP_ASYNC);
-       conference_stop_file(conference, FILE_STOP_ALL);
-       /* Close Unused Handles */
-       if (conference->fnode) {
-               conference_file_node_t *fnode, *cur;
-               switch_memory_pool_t *pool;
-
-               fnode = conference->fnode;
-               while (fnode) {
-                       cur = fnode;
-                       fnode = fnode->next;
-
-                       if (cur->type != NODE_TYPE_SPEECH) {
-                               switch_core_file_close(&cur->fh);
-                       }
-
-                       pool = cur->pool;
-                       switch_core_destroy_memory_pool(&pool);
-               }
-               conference->fnode = NULL;
-       }
-
-       if (conference->async_fnode) {
-               switch_memory_pool_t *pool;
-               switch_core_file_close(&conference->async_fnode->fh);
-               pool = conference->async_fnode->pool;
-               conference->async_fnode = NULL;
-               switch_core_destroy_memory_pool(&pool);
-       }
-
-       switch_mutex_lock(conference->member_mutex);
-       for (imember = conference->members; imember; imember = imember->next) {
-               switch_channel_t *channel;
-
-               if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) {
-                       channel = switch_core_session_get_channel(imember->session);
-
-                       /* add this little bit to preserve the bridge cause code in case of an early media call that */
-                       /* never answers */
-                       if (switch_test_flag(conference, CFLAG_ANSWERED)) {
-                               switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-                       } else {
-                               /* put actual cause code from outbound channel hangup here */
-                               switch_channel_hangup(channel, conference->bridge_hangup_cause);
-                       }
-               }
-
-               switch_clear_flag_locked(imember, MFLAG_RUNNING);
-       }
-       switch_mutex_unlock(conference->member_mutex);
-       switch_mutex_unlock(conference->mutex);
-
-       if (conference->video_running == 1) {
-               conference->video_running = -1;
-               while (conference->video_running) {
-                       switch_yield(1000);
-               }
-       }
-
-       if (switch_test_flag(conference, CFLAG_DESTRUCT)) {
-               switch_core_timer_destroy(&timer);
-               switch_mutex_lock(globals.hash_mutex);
-               switch_core_hash_delete(globals.conference_hash, conference->name);
-               switch_mutex_unlock(globals.hash_mutex);
-
-               /* Wait till everybody is out */
-               switch_clear_flag_locked(conference, CFLAG_RUNNING);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock ON\n");
-               switch_thread_rwlock_wrlock(conference->rwlock);
-               switch_thread_rwlock_unlock(conference->rwlock);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock OFF\n");
-
-               switch_ivr_digit_stream_parser_destroy(conference->dtmf_parser);
-
-               if (conference->sh) {
-                       switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-                       switch_core_speech_close(&conference->lsh, &flags);
-                       conference->sh = NULL;
-               }
-
-               if (conference->pool) {
-                       switch_memory_pool_t *pool = conference->pool;
-                       switch_core_destroy_memory_pool(&pool);
-               }
-       }
-
-       switch_mutex_lock(globals.hash_mutex);
-       globals.threads--;
-       switch_mutex_unlock(globals.hash_mutex);
-
-       return NULL;
+    if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "Inactive");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "terminated");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", "inbound");
+        switch_event_fire(&event);
+    }
+
+    switch_mutex_lock(conference->mutex);
+    conference_stop_file(conference, FILE_STOP_ASYNC);
+    conference_stop_file(conference, FILE_STOP_ALL);
+    /* Close Unused Handles */
+    if (conference->fnode) {
+        conference_file_node_t *fnode, *cur;
+        switch_memory_pool_t *pool;
+
+        fnode = conference->fnode;
+        while (fnode) {
+            cur = fnode;
+            fnode = fnode->next;
+
+            if (cur->type != NODE_TYPE_SPEECH) {
+                switch_core_file_close(&cur->fh);
+            }
+
+            pool = cur->pool;
+            switch_core_destroy_memory_pool(&pool);
+        }
+        conference->fnode = NULL;
+    }
+
+    if (conference->async_fnode) {
+        switch_memory_pool_t *pool;
+        switch_core_file_close(&conference->async_fnode->fh);
+        pool = conference->async_fnode->pool;
+        conference->async_fnode = NULL;
+        switch_core_destroy_memory_pool(&pool);
+    }
+
+    switch_mutex_lock(conference->member_mutex);
+    for (imember = conference->members; imember; imember = imember->next) {
+        switch_channel_t *channel;
+
+        if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) {
+            channel = switch_core_session_get_channel(imember->session);
+
+            /* add this little bit to preserve the bridge cause code in case of an early media call that */
+            /* never answers */
+            if (switch_test_flag(conference, CFLAG_ANSWERED)) {
+                switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+            } else {
+                /* put actual cause code from outbound channel hangup here */
+                switch_channel_hangup(channel, conference->bridge_hangup_cause);
+            }
+        }
+
+        switch_clear_flag_locked(imember, MFLAG_RUNNING);
+    }
+    switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(conference->mutex);
+
+    if (conference->video_running == 1) {
+        conference->video_running = -1;
+        while (conference->video_running) {
+            switch_yield(1000);
+        }
+    }
+
+    if (switch_test_flag(conference, CFLAG_DESTRUCT)) {
+        switch_core_timer_destroy(&timer);
+        switch_mutex_lock(globals.hash_mutex);
+        switch_core_hash_delete(globals.conference_hash, conference->name);
+        switch_mutex_unlock(globals.hash_mutex);
+
+        /* Wait till everybody is out */
+        switch_clear_flag_locked(conference, CFLAG_RUNNING);
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock ON\n");
+        switch_thread_rwlock_wrlock(conference->rwlock);
+        switch_thread_rwlock_unlock(conference->rwlock);
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock OFF\n");
+
+        switch_ivr_digit_stream_parser_destroy(conference->dtmf_parser);
+
+        if (conference->sh) {
+            switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
+            switch_core_speech_close(&conference->lsh, &flags);
+            conference->sh = NULL;
+        }
+
+        if (conference->pool) {
+            switch_memory_pool_t *pool = conference->pool;
+            switch_core_destroy_memory_pool(&pool);
+        }
+    }
+
+    switch_mutex_lock(globals.hash_mutex);
+    globals.threads--;
+    switch_mutex_unlock(globals.hash_mutex);
+
+    return NULL;
 }
 
 static void conference_loop_fn_mute_toggle(conference_member_t *member, caller_control_action_t *action)
 {
-       if (member == NULL)
-               return;
-
-       if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
-               conf_api_sub_mute(member, NULL, NULL);
-       } else {
-               conf_api_sub_unmute(member, NULL, NULL);
-               if (!switch_test_flag(member, MFLAG_CAN_HEAR)) {
-                       conf_api_sub_undeaf(member, NULL, NULL);
-               }
-       }
+    if (member == NULL)
+        return;
+
+    if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
+        conf_api_sub_mute(member, NULL, NULL);
+    } else {
+        conf_api_sub_unmute(member, NULL, NULL);
+        if (!switch_test_flag(member, MFLAG_CAN_HEAR)) {
+            conf_api_sub_undeaf(member, NULL, NULL);
+        }
+    }
 }
 
 static void conference_loop_fn_deafmute_toggle(conference_member_t *member, caller_control_action_t *action)
 {
-       if (member == NULL)
-               return;
-
-       if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
-               conf_api_sub_mute(member, NULL, NULL);
-               if (switch_test_flag(member, MFLAG_CAN_HEAR)) {
-                       conf_api_sub_deaf(member, NULL, NULL);
-               }
-       } else {
-               conf_api_sub_unmute(member, NULL, NULL);
-               if (!switch_test_flag(member, MFLAG_CAN_HEAR)) {
-                       conf_api_sub_undeaf(member, NULL, NULL);
-               }
-       }
+    if (member == NULL)
+        return;
+
+    if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
+        conf_api_sub_mute(member, NULL, NULL);
+        if (switch_test_flag(member, MFLAG_CAN_HEAR)) {
+            conf_api_sub_deaf(member, NULL, NULL);
+        }
+    } else {
+        conf_api_sub_unmute(member, NULL, NULL);
+        if (!switch_test_flag(member, MFLAG_CAN_HEAR)) {
+            conf_api_sub_undeaf(member, NULL, NULL);
+        }
+    }
 }
 
 static void conference_loop_fn_energy_up(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->energy_level += 200;
-       if (member->energy_level > 3000) {
-               member->energy_level = 3000;
-       }
-
-       if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->energy_level += 200;
+    if (member->energy_level > 3000) {
+        member->energy_level = 3000;
+    }
+
+    if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_energy_equ_conf(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->energy_level = member->conference->energy_level;
-
-       if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->energy_level = member->conference->energy_level;
+
+    if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_energy_dn(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->energy_level -= 100;
-       if (member->energy_level < 0) {
-               member->energy_level = 0;
-       }
-
-       if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->energy_level -= 100;
+    if (member->energy_level < 0) {
+        member->energy_level = 0;
+    }
+
+    if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_talk_up(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_out_level++;
-       switch_normalize_volume(member->volume_out_level);
-
-       if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_out_level++;
+    switch_normalize_volume(member->volume_out_level);
+
+    if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_talk_zero(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_out_level = 0;
-
-       if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_out_level = 0;
+
+    if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_talk_dn(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_out_level--;
-       switch_normalize_volume(member->volume_out_level);
-
-       if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_out_level--;
+    switch_normalize_volume(member->volume_out_level);
+
+    if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_listen_up(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_in_level++;
-       switch_normalize_volume(member->volume_in_level);
-
-       if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_in_level++;
+    switch_normalize_volume(member->volume_in_level);
+
+    if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_listen_zero(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_in_level = 0;
-
-       if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_in_level = 0;
+
+    if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_volume_listen_dn(conference_member_t *member, caller_control_action_t *action)
 {
-       char msg[512];
-       switch_event_t *event;
-
-       if (member == NULL)
-               return;
-
-       switch_mutex_lock(member->flag_mutex);
-       member->volume_in_level--;
-       switch_normalize_volume(member->volume_in_level);
-
-       if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
-               switch_event_fire(&event);
-       }
-       switch_mutex_unlock(member->flag_mutex);
-
-       switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
-       conference_member_say(member, msg, 0);
+    char msg[512];
+    switch_event_t *event;
+
+    if (member == NULL)
+        return;
+
+    switch_mutex_lock(member->flag_mutex);
+    member->volume_in_level--;
+    switch_normalize_volume(member->volume_in_level);
+
+    if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "gain-level");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level);
+        switch_event_fire(&event);
+    }
+    switch_mutex_unlock(member->flag_mutex);
+
+    switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level);
+    conference_member_say(member, msg, 0);
 }
 
 static void conference_loop_fn_event(conference_member_t *member, caller_control_action_t *action)
 {
-       switch_event_t *event;
-       if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "DTMF-Key", action->binded_dtmf);
-               switch_event_fire(&event);
-       }
+    switch_event_t *event;
+    if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "DTMF-Key", action->binded_dtmf);
+        switch_event_fire(&event);
+    }
 }
 
 static void conference_loop_fn_hangup(conference_member_t *member, caller_control_action_t *action)
 {
-       switch_clear_flag_locked(member, MFLAG_RUNNING);
+    switch_clear_flag_locked(member, MFLAG_RUNNING);
 }
 
 /* marshall frames from the call leg to the conference thread for muxing to other call legs */
 static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj)
 {
-       conference_member_t *member = obj;
-       switch_channel_t *channel;
-       switch_status_t status;
-       switch_frame_t *read_frame = NULL;
-
-       switch_codec_t *read_codec;
-       uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
-
-
-       switch_assert(member != NULL);
-
-       switch_clear_flag_locked(member, MFLAG_TALKING);
-
-       channel = switch_core_session_get_channel(member->session);
-
-       read_codec = switch_core_session_get_read_codec(member->session);
-       switch_assert(read_codec != NULL);
-
-       /* As long as we have a valid read, feed that data into an input buffer where the conference thread will take it 
-          and mux it with any audio from other channels. */
-
-       while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) {
-               /* Read a frame. */
-               status = switch_core_session_read_frame(member->session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-
-               /* end the loop, if appropriate */
-               if (!SWITCH_READ_ACCEPTABLE(status) || !switch_test_flag(member, MFLAG_RUNNING)) {
-                       break;
-               }
-
-               if (switch_test_flag(read_frame, SFF_CNG)) {
-                       if (hangunder_hits) {
-                               hangunder_hits--;
-                       }
-                       if (switch_test_flag(member, MFLAG_TALKING)) {
-                               switch_event_t *event;
-                               if (++hangover_hits >= hangover) {
-                                       hangover_hits = hangunder_hits = 0;
-                                       switch_clear_flag_locked(member, MFLAG_TALKING);
-
-                                       if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
-                                               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                                               conference_add_event_member_data(member, event);
-                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking");
-                                               switch_event_fire(&event);
-                                       }
-                               }
-                       }
-                       continue;
-               }
-
-               energy_level = member->energy_level;
-
-               /* if the member can speak, compute the audio energy level and */
-               /* generate events when the level crosses the threshold        */
-               if (switch_test_flag(member, MFLAG_CAN_SPEAK) && energy_level) {
-                       uint32_t energy = 0, i = 0, samples = 0, j = 0;
-                       int16_t *data;
-                       int divisor = 0;
-
-                       data = read_frame->data;
-
-                       if (!(divisor = read_codec->implementation->actual_samples_per_second / 8000)) {
-                               divisor = 1;
-                       }
-
-                       member->score = 0;
-
-                       if ((samples = read_frame->datalen / sizeof(*data))) {
-                               for (i = 0; i < samples; i++) {
-                                       energy += abs(data[j]);
-                                       j += read_codec->implementation->number_of_channels;
-                               }
-                               member->score = energy / (samples / divisor);
-                       }
-
-                       if (member->score > energy_level) {
-                               uint32_t diff = member->score - energy_level;
-                               if (hangover_hits) {
-                                       hangover_hits--;
-                               }
-
-                               if (diff >= diff_level || ++hangunder_hits >= hangunder) {
-                                       hangover_hits = hangunder_hits = 0;
-
-                                       if (!switch_test_flag(member, MFLAG_TALKING)) {
-                                               switch_event_t *event;
-                                               switch_set_flag_locked(member, MFLAG_TALKING);
-                                               switch_mutex_lock(member->conference->member_mutex);
-                                               if (!member->conference->floor_holder ||
-                                                       !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score >
-                                                       member->conference->floor_holder->score + 200) {
-                                                       if (test_eflag(member->conference, EFLAG_FLOOR_CHANGE) &&
-                                                               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                                                               conference_add_event_member_data(member, event);
-                                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "floor-change");
-                                                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-ID", "%d",
-                                                                                                               member->conference->floor_holder ? member->conference->floor_holder->id : 0);
-                                                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-ID", "%d", member->conference->floor_holder ? member->id : 0);
-                                                               switch_event_fire(&event);
-                                                       }
-                                                       member->conference->floor_holder = member;
-                                               }
-                                               switch_mutex_unlock(member->conference->member_mutex);
-
-                                               if (test_eflag(member->conference, EFLAG_START_TALKING) &&
-                                                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                                                       conference_add_event_member_data(member, event);
-                                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "start-talking");
-                                                       switch_event_fire(&event);
-                                               }
-                                       }
-                               }
-                       } else {
-                               if (hangunder_hits) {
-                                       hangunder_hits--;
-                               }
-                               if (switch_test_flag(member, MFLAG_TALKING)) {
-                                       switch_event_t *event;
-                                       if (++hangover_hits >= hangover) {
-                                               hangover_hits = hangunder_hits = 0;
-                                               switch_clear_flag_locked(member, MFLAG_TALKING);
-
-                                               if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
-                                                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                                                       conference_add_event_member_data(member, event);
-                                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking");
-                                                       switch_event_fire(&event);
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               /* skip frames that are not actual media or when we are muted or silent */
-               if ((switch_test_flag(member, MFLAG_TALKING) || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK)) {
-                       switch_audio_resampler_t *read_resampler = member->read_resampler;
-                       void *data;
-                       uint32_t datalen;
-                       
-                       if (read_resampler) {
-                               int16_t *bptr = (int16_t *) read_frame->data;
-                               int len = (int) read_frame->datalen;
-
-                               read_resampler->from_len = switch_short_to_float(bptr, read_resampler->from, (int) len / 2);
-                               read_resampler->to_len = switch_resample_process(read_resampler,
-                                                                                                                                read_resampler->from,
-                                                                                                                                read_resampler->from_len, read_resampler->to, read_resampler->to_size, 0);
-
-                               switch_float_to_short(read_resampler->to, member->resample_out, read_resampler->to_len);
-                               len = read_resampler->to_len * 2;
-                               datalen = len;
-                               data = member->resample_out;
-                       } else {
-                               data = read_frame->data;
-                               datalen = read_frame->datalen;
-                       }
-
-                       /* Check for input volume adjustments */
-                       if (member->volume_in_level) {
-                               switch_change_sln_volume(data, datalen / 2, member->volume_in_level);
-                       }
-
-                       if (datalen) {
-                               switch_size_t ok = 1;
-
-                               /* Write the audio into the input buffer */
-                               switch_mutex_lock(member->audio_in_mutex);
-                               ok = switch_buffer_write(member->audio_buffer, data, datalen);
-                               switch_mutex_unlock(member->audio_in_mutex);
-                               if (!ok) {
-                                       break;
-                               }
-                       }
-               }
-       }
-
-       switch_resample_destroy(&member->read_resampler);
-       switch_clear_flag_locked(member, MFLAG_ITHREAD);
-
-       return NULL;
+    conference_member_t *member = obj;
+    switch_channel_t *channel;
+    switch_status_t status;
+    switch_frame_t *read_frame = NULL;
+
+    switch_codec_t *read_codec;
+    uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
+
+
+    switch_assert(member != NULL);
+
+    switch_clear_flag_locked(member, MFLAG_TALKING);
+
+    channel = switch_core_session_get_channel(member->session);
+
+    read_codec = switch_core_session_get_read_codec(member->session);
+    switch_assert(read_codec != NULL);
+
+    /* As long as we have a valid read, feed that data into an input buffer where the conference thread will take it 
+       and mux it with any audio from other channels. */
+
+    while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) {
+        /* Read a frame. */
+        status = switch_core_session_read_frame(member->session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+
+        /* end the loop, if appropriate */
+        if (!SWITCH_READ_ACCEPTABLE(status) || !switch_test_flag(member, MFLAG_RUNNING)) {
+            break;
+        }
+
+        if (switch_test_flag(read_frame, SFF_CNG)) {
+            if (hangunder_hits) {
+                hangunder_hits--;
+            }
+            if (switch_test_flag(member, MFLAG_TALKING)) {
+                switch_event_t *event;
+                if (++hangover_hits >= hangover) {
+                    hangover_hits = hangunder_hits = 0;
+                    switch_clear_flag_locked(member, MFLAG_TALKING);
+
+                    if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
+                        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                        conference_add_event_member_data(member, event);
+                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking");
+                        switch_event_fire(&event);
+                    }
+                }
+            }
+            continue;
+        }
+
+        energy_level = member->energy_level;
+
+        /* if the member can speak, compute the audio energy level and */
+        /* generate events when the level crosses the threshold        */
+        if (switch_test_flag(member, MFLAG_CAN_SPEAK) && energy_level) {
+            uint32_t energy = 0, i = 0, samples = 0, j = 0;
+            int16_t *data;
+            int divisor = 0;
+
+            data = read_frame->data;
+
+            if (!(divisor = read_codec->implementation->actual_samples_per_second / 8000)) {
+                divisor = 1;
+            }
+
+            member->score = 0;
+
+            if ((samples = read_frame->datalen / sizeof(*data))) {
+                for (i = 0; i < samples; i++) {
+                    energy += abs(data[j]);
+                    j += read_codec->implementation->number_of_channels;
+                }
+                member->score = energy / (samples / divisor);
+            }
+
+            if (member->score > energy_level) {
+                uint32_t diff = member->score - energy_level;
+                if (hangover_hits) {
+                    hangover_hits--;
+                }
+
+                if (diff >= diff_level || ++hangunder_hits >= hangunder) {
+                    hangover_hits = hangunder_hits = 0;
+
+                    if (!switch_test_flag(member, MFLAG_TALKING)) {
+                        switch_event_t *event;
+                        switch_set_flag_locked(member, MFLAG_TALKING);
+                        switch_mutex_lock(member->conference->member_mutex);
+                        if (!member->conference->floor_holder ||
+                            !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score >
+                            member->conference->floor_holder->score + 200) {
+                            if (test_eflag(member->conference, EFLAG_FLOOR_CHANGE) &&
+                                switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                                conference_add_event_member_data(member, event);
+                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "floor-change");
+                                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-ID", "%d",
+                                                        member->conference->floor_holder ? member->conference->floor_holder->id : 0);
+                                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-ID", "%d", member->conference->floor_holder ? member->id : 0);
+                                switch_event_fire(&event);
+                            }
+                            member->conference->floor_holder = member;
+                        }
+                        switch_mutex_unlock(member->conference->member_mutex);
+
+                        if (test_eflag(member->conference, EFLAG_START_TALKING) &&
+                            switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                            conference_add_event_member_data(member, event);
+                            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "start-talking");
+                            switch_event_fire(&event);
+                        }
+                    }
+                }
+            } else {
+                if (hangunder_hits) {
+                    hangunder_hits--;
+                }
+                if (switch_test_flag(member, MFLAG_TALKING)) {
+                    switch_event_t *event;
+                    if (++hangover_hits >= hangover) {
+                        hangover_hits = hangunder_hits = 0;
+                        switch_clear_flag_locked(member, MFLAG_TALKING);
+
+                        if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
+                            switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                            conference_add_event_member_data(member, event);
+                            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking");
+                            switch_event_fire(&event);
+                        }
+                    }
+                }
+            }
+        }
+
+        /* skip frames that are not actual media or when we are muted or silent */
+        if ((switch_test_flag(member, MFLAG_TALKING) || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK)) {
+            switch_audio_resampler_t *read_resampler = member->read_resampler;
+            void *data;
+            uint32_t datalen;
+            
+            if (read_resampler) {
+                int16_t *bptr = (int16_t *) read_frame->data;
+                int len = (int) read_frame->datalen;
+
+                read_resampler->from_len = switch_short_to_float(bptr, read_resampler->from, (int) len / 2);
+                read_resampler->to_len = switch_resample_process(read_resampler,
+                                                                 read_resampler->from,
+                                                                 read_resampler->from_len, read_resampler->to, read_resampler->to_size, 0);
+
+                switch_float_to_short(read_resampler->to, member->resample_out, read_resampler->to_len);
+                len = read_resampler->to_len * 2;
+                datalen = len;
+                data = member->resample_out;
+            } else {
+                data = read_frame->data;
+                datalen = read_frame->datalen;
+            }
+
+            /* Check for input volume adjustments */
+            if (member->volume_in_level) {
+                switch_change_sln_volume(data, datalen / 2, member->volume_in_level);
+            }
+
+            if (datalen) {
+                switch_size_t ok = 1;
+
+                /* Write the audio into the input buffer */
+                switch_mutex_lock(member->audio_in_mutex);
+                ok = switch_buffer_write(member->audio_buffer, data, datalen);
+                switch_mutex_unlock(member->audio_in_mutex);
+                if (!ok) {
+                    break;
+                }
+            }
+        }
+    }
+
+    switch_resample_destroy(&member->read_resampler);
+    switch_clear_flag_locked(member, MFLAG_ITHREAD);
+
+    return NULL;
 }
 
 /* launch an input thread for the call leg */
 static void launch_conference_loop_input(conference_member_t *member, switch_memory_pool_t *pool)
 {
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
+    switch_thread_t *thread;
+    switch_threadattr_t *thd_attr = NULL;
 
-       if (member == NULL)
-               return;
+    if (member == NULL)
+        return;
 
-       switch_threadattr_create(&thd_attr, pool);
-       switch_threadattr_detach_set(thd_attr, 1);
-       switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-       switch_set_flag_locked(member, MFLAG_ITHREAD);
-       switch_thread_create(&thread, thd_attr, conference_loop_input, member, pool);
+    switch_threadattr_create(&thd_attr, pool);
+    switch_threadattr_detach_set(thd_attr, 1);
+    switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+    switch_set_flag_locked(member, MFLAG_ITHREAD);
+    switch_thread_create(&thread, thd_attr, conference_loop_input, member, pool);
 }
 
 static caller_control_fn_table_t ccfntbl[] = {
-       {"mute", "0", CALLER_CONTROL_MUTE, conference_loop_fn_mute_toggle},
-       {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE, conference_loop_fn_deafmute_toggle},
-       {"energy up", "9", CALLER_CONTROL_ENERGY_UP, conference_loop_fn_energy_up},
-       {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONF, conference_loop_fn_energy_equ_conf},
-       {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN, conference_loop_fn_energy_dn},
-       {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP, conference_loop_fn_volume_talk_up},
-       {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO, conference_loop_fn_volume_talk_zero},
-       {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN, conference_loop_fn_volume_talk_dn},
-       {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP, conference_loop_fn_volume_listen_up},
-       {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero},
-       {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn},
-       {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup},
-       {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}
+    {"mute", "0", CALLER_CONTROL_MUTE, conference_loop_fn_mute_toggle},
+    {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE, conference_loop_fn_deafmute_toggle},
+    {"energy up", "9", CALLER_CONTROL_ENERGY_UP, conference_loop_fn_energy_up},
+    {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONF, conference_loop_fn_energy_equ_conf},
+    {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN, conference_loop_fn_energy_dn},
+    {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP, conference_loop_fn_volume_talk_up},
+    {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO, conference_loop_fn_volume_talk_zero},
+    {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN, conference_loop_fn_volume_talk_dn},
+    {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP, conference_loop_fn_volume_listen_up},
+    {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero},
+    {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn},
+    {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup},
+    {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}
 };
 
 #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0]))
@@ -1732,3619 +1744,3606 @@ static caller_control_fn_table_t ccfntbl[] = {
 /* NB. this starts the input thread after some initial setup for the call leg */
 static void conference_loop_output(conference_member_t *member)
 {
-       switch_channel_t *channel = switch_core_session_get_channel(member->session);
-       switch_frame_t write_frame = { 0 };
-       uint8_t *data;
-       switch_timer_t timer = { 0 };
-       switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session);
-       uint32_t interval = read_codec->implementation->microseconds_per_packet / 1000;
-       uint32_t samples = switch_samples_per_packet(member->conference->rate, interval);
-       uint32_t csamples = samples;
-       uint32_t tsamples = member->orig_read_codec->implementation->samples_per_packet;
-       uint32_t flush_len = 0;
-       uint32_t low_count = 0, bytes = samples * 2;
-       call_list_t *call_list = NULL, *cp = NULL;
-
-       switch_assert(member->conference != NULL);
-
-       flush_len = switch_samples_per_packet(member->conference->rate, member->conference->interval) * 10;
-
-       if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
-               return;
-       }
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u  samples: %u\n",
-                                         member->conference->timer_name, interval, tsamples);
-
-       write_frame.data = data = switch_core_session_alloc(member->session, SWITCH_RECOMMENDED_BUFFER_SIZE);
-       write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
-       write_frame.codec = &member->write_codec;
-
-       if (!switch_test_flag(member->conference, CFLAG_ANSWERED)) {
-               switch_channel_answer(channel);
-       }
-
-       /* Start the input thread */
-       launch_conference_loop_input(member, switch_core_session_get_pool(member->session));
-
-       /* build a digit stream object */
-       if (member->conference->dtmf_parser != NULL
-               && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n");
-       }
-
-       if ((call_list = switch_channel_get_private(channel, "_conference_autocall_list_"))) {
-               const char *cid_name = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_name");
-               const char *cid_num = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_number");
-               const char *toval = switch_channel_get_variable(channel, "conference_auto_outcall_timeout");
-               const char *flags = switch_channel_get_variable(channel, "conference_auto_outcall_flags");
-               const char *ann = switch_channel_get_variable(channel, "conference_auto_outcall_announce");
-               int to = 60;
-
-               if (ann) {
-                       member->conference->special_announce = switch_core_strdup(member->conference->pool, ann);
-               }
-
-               switch_channel_set_private(channel, "_conference_autocall_list_", NULL);
-
-               if (toval) {
-                       to = atoi(toval);
-                       if (to < 10 || to > 500) {
-                               to = 60;
-                       }
-               }
-
-               for (cp = call_list; cp; cp = cp->next) {
-                       conference_outcall_bg(member->conference, NULL, NULL, cp->string, to, switch_str_nil(flags), cid_name, cid_num);
-               }
-       }
-       /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed,      */
-       /* you better not block this thread loop for more than the duration of member->conference->timer_name!  */
-       while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD)
-                  && switch_channel_ready(channel)) {
-               char dtmf[128] = "";
-               uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
-               char *digit;
-               switch_event_t *event;
-               caller_control_action_t *caller_action = NULL;
-               int use_timer = 0;
-               switch_size_t file_sample_len = csamples;
-               switch_size_t file_data_len = file_sample_len * 2;
-
-               switch_mutex_lock(member->flag_mutex);
-
-               if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) {
-                       if (event->event_id == SWITCH_EVENT_MESSAGE) {
-                               char *from = switch_event_get_header(event, "from");
-                               char *to = switch_event_get_header(event, "to");
-                               char *proto = switch_event_get_header(event, "proto");
-                               char *subject = switch_event_get_header(event, "subject");
-                               char *hint = switch_event_get_header(event, "hint");
-                               char *body = switch_event_get_body(event);
-                               char *p, *freeme = NULL;
-
-                               if (to && from && body) {
-                                       if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) {
-                                               freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain);
-                                               to = freeme;
-                                       }
-                                       chat_send(proto, from, to, subject, body, hint);
-                                       switch_safe_free(freeme);
-                               }
-                       }
-                       switch_event_destroy(&event);
-               }
-
-               if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
-                       /* test to see if outbound channel has answered */
-                       if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n");
-                               switch_set_flag(member->conference, CFLAG_ANSWERED);
-                       }
-               } else {
-                       if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n");
-                               switch_channel_answer(channel);
-                       }
-               }
-
-               /* if we have caller digits, feed them to the parser to find an action */
-               if (switch_channel_has_dtmf(channel)) {
-                       switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf));
-
-                       if (member->conference->dtmf_parser != NULL) {
-
-                               for (digit = dtmf; *digit && caller_action == NULL; digit++) {
-                                       caller_action = (caller_control_action_t *)
-                                               switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit);
-                               }
-                       }
-                       /* otherwise, clock the parser so that it can handle digit timeout detection */
-               } else if (member->conference->dtmf_parser != NULL) {
-                       caller_action = (caller_control_action_t *) switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0');
-               }
-
-               /* if a caller action has been detected, handle it */
-               if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) {
-                       char *param = NULL;
-
-                       if (caller_action->fndesc->action != CALLER_CONTROL_MENU) {
-                               param = caller_action->data;
-                       }
+    switch_channel_t *channel = switch_core_session_get_channel(member->session);
+    switch_frame_t write_frame = { 0 };
+    uint8_t *data;
+    switch_timer_t timer = { 0 };
+    switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session);
+    uint32_t interval = read_codec->implementation->microseconds_per_packet / 1000;
+    uint32_t samples = switch_samples_per_packet(member->conference->rate, interval);
+    uint32_t csamples = samples;
+    uint32_t tsamples = member->orig_read_codec->implementation->samples_per_packet;
+    uint32_t flush_len = 0;
+    uint32_t low_count = 0, bytes = samples * 2;
+    call_list_t *call_list = NULL, *cp = NULL;
+
+    switch_assert(member->conference != NULL);
+
+    flush_len = switch_samples_per_packet(member->conference->rate, member->conference->interval) * 10;
+
+    if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
+        return;
+    }
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u  samples: %u\n",
+                      member->conference->timer_name, interval, tsamples);
+
+    write_frame.data = data = switch_core_session_alloc(member->session, SWITCH_RECOMMENDED_BUFFER_SIZE);
+    write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+    write_frame.codec = &member->write_codec;
+
+    if (!switch_test_flag(member->conference, CFLAG_ANSWERED)) {
+        switch_channel_answer(channel);
+    }
+
+    /* Start the input thread */
+    launch_conference_loop_input(member, switch_core_session_get_pool(member->session));
+
+    /* build a digit stream object */
+    if (member->conference->dtmf_parser != NULL
+        && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n");
+    }
+
+    if ((call_list = switch_channel_get_private(channel, "_conference_autocall_list_"))) {
+        const char *cid_name = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_name");
+        const char *cid_num = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_number");
+        const char *toval = switch_channel_get_variable(channel, "conference_auto_outcall_timeout");
+        const char *flags = switch_channel_get_variable(channel, "conference_auto_outcall_flags");
+        const char *ann = switch_channel_get_variable(channel, "conference_auto_outcall_announce");
+        int to = 60;
+
+        if (ann) {
+            member->conference->special_announce = switch_core_strdup(member->conference->pool, ann);
+        }
+
+        switch_channel_set_private(channel, "_conference_autocall_list_", NULL);
+
+        if (toval) {
+            to = atoi(toval);
+            if (to < 10 || to > 500) {
+                to = 60;
+            }
+        }
+
+        for (cp = call_list; cp; cp = cp->next) {
+            conference_outcall_bg(member->conference, NULL, NULL, cp->string, to, switch_str_nil(flags), cid_name, cid_num);
+        }
+    }
+    /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed,      */
+    /* you better not block this thread loop for more than the duration of member->conference->timer_name!  */
+    while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD)
+           && switch_channel_ready(channel)) {
+        char dtmf[128] = "";
+        uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
+        char *digit;
+        switch_event_t *event;
+        caller_control_action_t *caller_action = NULL;
+        int use_timer = 0;
+        switch_size_t file_sample_len = csamples;
+        switch_size_t file_data_len = file_sample_len * 2;
+
+        switch_mutex_lock(member->flag_mutex);
+
+        if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) {
+            if (event->event_id == SWITCH_EVENT_MESSAGE) {
+                char *from = switch_event_get_header(event, "from");
+                char *to = switch_event_get_header(event, "to");
+                char *proto = switch_event_get_header(event, "proto");
+                char *subject = switch_event_get_header(event, "subject");
+                char *hint = switch_event_get_header(event, "hint");
+                char *body = switch_event_get_body(event);
+                char *p, *freeme = NULL;
+
+                if (to && from && body) {
+                    if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) {
+                        freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain);
+                        to = freeme;
+                    }
+                    chat_send(proto, from, to, subject, body, hint);
+                    switch_safe_free(freeme);
+                }
+            }
+            switch_event_destroy(&event);
+        }
+
+        if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
+            /* test to see if outbound channel has answered */
+            if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n");
+                switch_set_flag(member->conference, CFLAG_ANSWERED);
+            }
+        } else {
+            if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n");
+                switch_channel_answer(channel);
+            }
+        }
+
+        /* if we have caller digits, feed them to the parser to find an action */
+        if (switch_channel_has_dtmf(channel)) {
+            switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf));
+
+            if (member->conference->dtmf_parser != NULL) {
+
+                for (digit = dtmf; *digit && caller_action == NULL; digit++) {
+                    caller_action = (caller_control_action_t *)
+                        switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit);
+                }
+            }
+            /* otherwise, clock the parser so that it can handle digit timeout detection */
+        } else if (member->conference->dtmf_parser != NULL) {
+            caller_action = (caller_control_action_t *) switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0');
+        }
+
+        /* if a caller action has been detected, handle it */
+        if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) {
+            char *param = NULL;
+
+            if (caller_action->fndesc->action != CALLER_CONTROL_MENU) {
+                param = caller_action->data;
+            }
 #ifdef INTENSE_DEBUG
-                       switch_log_printf(SWITCH_CHANNEL_LOG,
-                                                         SWITCH_LOG_INFO,
-                                                         "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n",
-                                                         caller_action->fndesc->key,
-                                                         param ? param : "none", member->id, switch_channel_get_name(channel), profile->caller_id_name, profile->caller_id_number);
+            switch_log_printf(SWITCH_CHANNEL_LOG,
+                              SWITCH_LOG_INFO,
+                              "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n",
+                              caller_action->fndesc->key,
+                              param ? param : "none", member->id, switch_channel_get_name(channel), profile->caller_id_name, profile->caller_id_number);
 #endif
 
-                       caller_action->fndesc->handler(member, caller_action);
-
-                       /* set up for next pass */
-                       caller_action = NULL;
-               }
-
-               /* handle file and TTS frames */
-               if (member->fnode) {
-                       /* if we are done, clean it up */
-                       if (member->fnode->done) {
-                               conference_file_node_t *fnode;
-                               switch_memory_pool_t *pool;
-
-                               if (member->fnode->type != NODE_TYPE_SPEECH) {
-                                       switch_core_file_close(&member->fnode->fh);
-                               }
-
-                               fnode = member->fnode;
-                               member->fnode = member->fnode->next;
-
-                               pool = fnode->pool;
-                               fnode = NULL;
-                               switch_core_destroy_memory_pool(&pool);
-                       } else {
-                               /* skip this frame until leadin time has expired */
-                               if (member->fnode->leadin) {
-                                       member->fnode->leadin--;
-                               } else {                /* send the node frame instead of the conference frame to the call leg */
-                                       if (member->fnode->type == NODE_TYPE_SPEECH) {
-                                               switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING;
-                                               uint32_t rate = member->conference->rate;
-
-                                               if (switch_core_speech_read_tts(member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) {
-                                                       file_sample_len = file_data_len / 2;
-                                               } else {
-                                                       file_sample_len = file_data_len = 0;
-                                               }
-                                       } else if (member->fnode->type == NODE_TYPE_FILE) {
-                                               switch_core_file_read(&member->fnode->fh, file_frame, &file_sample_len);
-                                               file_data_len = file_sample_len * 2;
-                                       }
-
-                                       if (file_sample_len <= 0) {
-                                               member->fnode->done++;
-                                       } else {        /* there is file node data to deliver */
-                                               write_frame.data = file_frame;
-                                               write_frame.datalen = (uint32_t) file_data_len;
-                                               write_frame.samples = (uint32_t) file_sample_len;
-                                               /* Check for output volume adjustments */
-                                               if (member->volume_out_level) {
-                                                       switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level);
-                                               }
-                                               write_frame.timestamp = timer.samplecount;
-                                               switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
-                                               switch_core_timer_next(&timer);
-
-
-                                               /* forget the conference data we played file node data instead */
-                                               switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
-                                       }
-                               }
-                       }
-               } else {
-                       switch_buffer_t *use_buffer = NULL;
-                       uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
-
-                       if (mux_used) {
-                               if (mux_used < bytes) {
-                                       if (++low_count >= 5) {
-                                               /* partial frame sitting around this long is useless and builds delay */
-                                               switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
-                                       }
-                               } else if (mux_used > flush_len) {
-                                       /* getting behind, clear the buffer */
-                                       switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
-                               }
-                       }
-
-
-                       use_timer = 1;
-
-                       if (mux_used) {
-                               /* Flush the output buffer and write all the data (presumably muxed) back to the channel */
-                               switch_mutex_lock(member->audio_out_mutex);
-                               write_frame.data = data;
-                               use_buffer = member->mux_buffer;
-                               low_count = 0;
-                               if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) {
-                                       if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) {
-                                               write_frame.samples = write_frame.datalen / 2;
-
-                                               /* Check for output volume adjustments */
-                                               if (member->volume_out_level) {
-                                                       switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level);
-                                               }
-                                               write_frame.timestamp = timer.samplecount;
-                                               switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
-                                       }
-                               }
-
-                               switch_mutex_unlock(member->audio_out_mutex);
-                       } else {
-                               if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) {
-                                       if (member->conference->comfort_noise_level) {
-                                               switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level);
-                                       } else {
-                                               memset(write_frame.data, 255, bytes);
-                                       }
-                                       write_frame.datalen = bytes;
-                                       write_frame.samples = samples;
-                                       write_frame.timestamp = timer.samplecount;
-                                       switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
-                               }
-                       }
-               }
-
-               if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
-                       if (switch_buffer_inuse(member->mux_buffer)) {
-                               switch_mutex_lock(member->audio_out_mutex);
-                               switch_buffer_zero(member->mux_buffer);
-                               switch_mutex_unlock(member->audio_out_mutex);
-                       }
-                       switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER);
-               }
-
-               switch_mutex_unlock(member->flag_mutex);
-
-               if (use_timer) {
-                       switch_core_timer_next(&timer);
-               } else {
-                       switch_yield(1000);
-               }
-
-       }                                                       /* Rinse ... Repeat */
-
-       if (member->digit_stream != NULL) {
-               switch_ivr_digit_stream_destroy(member->digit_stream);
-       }
-
-       switch_clear_flag_locked(member, MFLAG_RUNNING);
-       switch_core_timer_destroy(&timer);
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n",
-                                         switch_channel_cause2str(switch_channel_get_cause(channel)));
-
-       /* if it's an outbound channel, store the release cause in the conference struct, we might need it */
-       if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
-               member->conference->bridge_hangup_cause = switch_channel_get_cause(channel);
-       }
-
-       /* Wait for the input thread to end */
-       while (switch_test_flag(member, MFLAG_ITHREAD)) {
-               switch_yield(1000);
-       }
+            caller_action->fndesc->handler(member, caller_action);
+
+            /* set up for next pass */
+            caller_action = NULL;
+        }
+
+        /* handle file and TTS frames */
+        if (member->fnode) {
+            /* if we are done, clean it up */
+            if (member->fnode->done) {
+                conference_file_node_t *fnode;
+                switch_memory_pool_t *pool;
+
+                if (member->fnode->type != NODE_TYPE_SPEECH) {
+                    switch_core_file_close(&member->fnode->fh);
+                }
+
+                fnode = member->fnode;
+                member->fnode = member->fnode->next;
+
+                pool = fnode->pool;
+                fnode = NULL;
+                switch_core_destroy_memory_pool(&pool);
+            } else {
+                /* skip this frame until leadin time has expired */
+                if (member->fnode->leadin) {
+                    member->fnode->leadin--;
+                } else {        /* send the node frame instead of the conference frame to the call leg */
+                    if (member->fnode->type == NODE_TYPE_SPEECH) {
+                        switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING;
+                        uint32_t rate = member->conference->rate;
+
+                        if (switch_core_speech_read_tts(member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) {
+                            file_sample_len = file_data_len / 2;
+                        } else {
+                            file_sample_len = file_data_len = 0;
+                        }
+                    } else if (member->fnode->type == NODE_TYPE_FILE) {
+                        switch_core_file_read(&member->fnode->fh, file_frame, &file_sample_len);
+                        file_data_len = file_sample_len * 2;
+                    }
+
+                    if (file_sample_len <= 0) {
+                        member->fnode->done++;
+                    } else {    /* there is file node data to deliver */
+                        write_frame.data = file_frame;
+                        write_frame.datalen = (uint32_t) file_data_len;
+                        write_frame.samples = (uint32_t) file_sample_len;
+                        /* Check for output volume adjustments */
+                        if (member->volume_out_level) {
+                            switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level);
+                        }
+                        write_frame.timestamp = timer.samplecount;
+                        switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
+                        switch_core_timer_next(&timer);
+
+
+                        /* forget the conference data we played file node data instead */
+                        switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
+                    }
+                }
+            }
+        } else {
+            switch_buffer_t *use_buffer = NULL;
+            uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
+
+            if (mux_used) {
+                if (mux_used < bytes) {
+                    if (++low_count >= 5) {
+                        /* partial frame sitting around this long is useless and builds delay */
+                        switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
+                    }
+                } else if (mux_used > flush_len) {
+                    /* getting behind, clear the buffer */
+                    switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
+                }
+            }
+
+
+            use_timer = 1;
+
+            if (mux_used) {
+                /* Flush the output buffer and write all the data (presumably muxed) back to the channel */
+                switch_mutex_lock(member->audio_out_mutex);
+                write_frame.data = data;
+                use_buffer = member->mux_buffer;
+                low_count = 0;
+                if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) {
+                    if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) {
+                        write_frame.samples = write_frame.datalen / 2;
+
+                        /* Check for output volume adjustments */
+                        if (member->volume_out_level) {
+                            switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level);
+                        }
+                        write_frame.timestamp = timer.samplecount;
+                        switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
+                    }
+                }
+
+                switch_mutex_unlock(member->audio_out_mutex);
+            } else {
+                if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) {
+                    if (member->conference->comfort_noise_level) {
+                        switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level);
+                    } else {
+                        memset(write_frame.data, 255, bytes);
+                    }
+                    write_frame.datalen = bytes;
+                    write_frame.samples = samples;
+                    write_frame.timestamp = timer.samplecount;
+                    switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
+                }
+            }
+        }
+
+        if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
+            if (switch_buffer_inuse(member->mux_buffer)) {
+                switch_mutex_lock(member->audio_out_mutex);
+                switch_buffer_zero(member->mux_buffer);
+                switch_mutex_unlock(member->audio_out_mutex);
+            }
+            switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER);
+        }
+
+        switch_mutex_unlock(member->flag_mutex);
+
+        if (use_timer) {
+            switch_core_timer_next(&timer);
+        } else {
+            switch_yield(1000);
+        }
+
+    }                           /* Rinse ... Repeat */
+
+    if (member->digit_stream != NULL) {
+        switch_ivr_digit_stream_destroy(member->digit_stream);
+    }
+
+    switch_clear_flag_locked(member, MFLAG_RUNNING);
+    switch_core_timer_destroy(&timer);
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n",
+                      switch_channel_cause2str(switch_channel_get_cause(channel)));
+
+    /* if it's an outbound channel, store the release cause in the conference struct, we might need it */
+    if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
+        member->conference->bridge_hangup_cause = switch_channel_get_cause(channel);
+    }
+
+    /* Wait for the input thread to end */
+    while (switch_test_flag(member, MFLAG_ITHREAD)) {
+        switch_yield(1000);
+    }
 }
 
 /* Sub-Routine called by a record entity inside a conference */
 static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, void *obj)
 {
-       uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
-       switch_file_handle_t fh = { 0 };
-       conference_member_t smember = { 0 }, *member;
-       conference_record_t *rec = (conference_record_t *) obj;
-       conference_obj_t *conference = rec->conference;
-       uint32_t samples = switch_samples_per_packet(conference->rate, conference->interval);
-       uint32_t low_count = 0, mux_used;
-       char *vval;
-       switch_timer_t timer = { 0 };
-       uint32_t rlen;
-
-       if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
-               return NULL;
-       }
-
-       switch_mutex_lock(globals.hash_mutex);
-       globals.threads++;
-       switch_mutex_unlock(globals.hash_mutex);
-
-       member = &smember;
-
-       member->flags = MFLAG_CAN_HEAR | MFLAG_NOCHANNEL | MFLAG_RUNNING;
-
-       member->conference = conference;
-       member->native_rate = conference->rate;
-       member->rec_path = rec->path;
-       fh.channels = 1;
-       fh.samplerate = conference->rate;
-       member->id = next_member_id();
-       member->pool = rec->pool;
-
-       member->frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
-       member->frame = switch_core_alloc(member->pool, member->frame_size);
-       member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
-
-
-       switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
-       switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool);
-       switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);
-
-       /* Setup an audio buffer for the incoming audio */
-       if (switch_buffer_create_dynamic(&member->audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-               goto end;
-       }
-
-       /* Setup an audio buffer for the outgoing audio */
-       if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-               goto end;
-       }
-
-       if (conference_add_member(conference, member) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Joining Conference\n");
-               goto end;
-       }
-
-       if (switch_core_file_open(&fh,
-                                                         rec->path, (uint8_t) 1, conference->rate, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT,
-                                                         rec->pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s]\n", rec->path);
-               goto end;
-       }
-
-
-       if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, rec->pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success interval: %u  samples: %u\n", conference->interval, samples);
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
-               goto end;
-       }
-
-       if ((vval = switch_mprintf("Conference %s", conference->name))) {
-               switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_TITLE, vval);
-               switch_safe_free(vval);
-       }
-
-       switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_ARTIST, "FreeSWITCH mod_conference Software Conference Module");
-
-       while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) {
-               switch_size_t len;
-               mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
-
-               if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
-                       if (mux_used) {
-                               switch_mutex_lock(member->audio_out_mutex);
-                               switch_buffer_zero(member->mux_buffer);
-                               switch_mutex_unlock(member->audio_out_mutex);
-                               mux_used = 0;
-                       }
-                       switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER);
-               }
-
-               if (mux_used) {
-                       /* Flush the output buffer and write all the data (presumably muxed) to the file */
-                       switch_mutex_lock(member->audio_out_mutex);
-                       low_count = 0;
-
-                       if ((rlen = (uint32_t) switch_buffer_read(member->mux_buffer, data, sizeof(data)))) {
-                               if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
-                                       len = (switch_size_t) rlen / sizeof(int16_t);
-                               }
-                       }
-                       switch_mutex_unlock(member->audio_out_mutex);
-               } else {
-                       if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
-                               len = (switch_size_t) samples;
-                               memset(data, 0, len);
-                       }
-               }
-
-               if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
-                       if (switch_core_file_write(&fh, data, &len) != SWITCH_STATUS_SUCCESS) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Failed\n");
-                               switch_clear_flag_locked(member, MFLAG_RUNNING);
-                       }
-               }
-
-               switch_core_timer_next(&timer);
-       }                                                       /* Rinse ... Repeat */
-
 end:
-
-       switch_core_timer_destroy(&timer);
-       conference_del_member(conference, member);
-       switch_buffer_destroy(&member->audio_buffer);
-       switch_buffer_destroy(&member->mux_buffer);
-       switch_clear_flag_locked(member, MFLAG_RUNNING);
-       if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
-               switch_core_file_close(&fh);
-       }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n");
-
-       if (rec->pool) {
-               switch_memory_pool_t *pool = rec->pool;
-               rec = NULL;
-               switch_core_destroy_memory_pool(&pool);
-       }
-
-       switch_mutex_lock(globals.hash_mutex);
-       globals.threads--;
-       switch_mutex_unlock(globals.hash_mutex);
-
-       switch_thread_rwlock_unlock(conference->rwlock);
-       return NULL;
+    uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
+    switch_file_handle_t fh = { 0 };
+    conference_member_t smember = { 0 }, *member;
+    conference_record_t *rec = (conference_record_t *) obj;
+    conference_obj_t *conference = rec->conference;
+    uint32_t samples = switch_samples_per_packet(conference->rate, conference->interval);
+    uint32_t low_count = 0, mux_used;
+    char *vval;
+    switch_timer_t timer = { 0 };
+    uint32_t rlen;
+
+    if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+        return NULL;
+    }
+
+    switch_mutex_lock(globals.hash_mutex);
+    globals.threads++;
+    switch_mutex_unlock(globals.hash_mutex);
+
+    member = &smember;
+
+    member->flags = MFLAG_CAN_HEAR | MFLAG_NOCHANNEL | MFLAG_RUNNING;
+
+    member->conference = conference;
+    member->native_rate = conference->rate;
+    member->rec_path = rec->path;
+    fh.channels = 1;
+    fh.samplerate = conference->rate;
+    member->id = next_member_id();
+    member->pool = rec->pool;
+
+    member->frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
+    member->frame = switch_core_alloc(member->pool, member->frame_size);
+    member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
+
+
+    switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
+    switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool);
+    switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);
+
+    /* Setup an audio buffer for the incoming audio */
+    if (switch_buffer_create_dynamic(&member->audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+        goto end;
+    }
+
+    /* Setup an audio buffer for the outgoing audio */
+    if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+        goto end;
+    }
+
+    if (conference_add_member(conference, member) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Joining Conference\n");
+        goto end;
+    }
+
+    if (switch_core_file_open(&fh,
+                              rec->path, (uint8_t) 1, conference->rate, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT,
+                              rec->pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s]\n", rec->path);
+        goto end;
+    }
+
+
+    if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, rec->pool) == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success interval: %u  samples: %u\n", conference->interval, samples);
+    } else {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
+        goto end;
+    }
+
+    if ((vval = switch_mprintf("Conference %s", conference->name))) {
+        switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_TITLE, vval);
+        switch_safe_free(vval);
+    }
+
+    switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_ARTIST, "FreeSWITCH mod_conference Software Conference Module");
+
+    while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) {
+        switch_size_t len;
+        mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
+
+        if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
+            if (mux_used) {
+                switch_mutex_lock(member->audio_out_mutex);
+                switch_buffer_zero(member->mux_buffer);
+                switch_mutex_unlock(member->audio_out_mutex);
+                mux_used = 0;
+            }
+            switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER);
+        }
+
+        if (mux_used) {
+            /* Flush the output buffer and write all the data (presumably muxed) to the file */
+            switch_mutex_lock(member->audio_out_mutex);
+            low_count = 0;
+
+            if ((rlen = (uint32_t) switch_buffer_read(member->mux_buffer, data, sizeof(data)))) {
+                if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
+                    len = (switch_size_t) rlen / sizeof(int16_t);
+                }
+            }
+            switch_mutex_unlock(member->audio_out_mutex);
+        } else {
+            if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
+                len = (switch_size_t) samples;
+                memset(data, 0, len);
+            }
+        }
+
+        if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
+            if (switch_core_file_write(&fh, data, &len) != SWITCH_STATUS_SUCCESS) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Failed\n");
+                switch_clear_flag_locked(member, MFLAG_RUNNING);
+            }
+        }
+
+        switch_core_timer_next(&timer);
+    }                           /* Rinse ... Repeat */
+
+ end:
+
+    switch_core_timer_destroy(&timer);
+    conference_del_member(conference, member);
+    switch_buffer_destroy(&member->audio_buffer);
+    switch_buffer_destroy(&member->mux_buffer);
+    switch_clear_flag_locked(member, MFLAG_RUNNING);
+    if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
+        switch_core_file_close(&fh);
+    }
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n");
+
+    if (rec->pool) {
+        switch_memory_pool_t *pool = rec->pool;
+        rec = NULL;
+        switch_core_destroy_memory_pool(&pool);
+    }
+
+    switch_mutex_lock(globals.hash_mutex);
+    globals.threads--;
+    switch_mutex_unlock(globals.hash_mutex);
+
+    switch_thread_rwlock_unlock(conference->rwlock);
+    return NULL;
 }
 
 /* Make files stop playing in a conference either the current one or all of them */
 static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop)
 {
-       uint32_t count = 0;
-       conference_file_node_t *nptr;
-
-       switch_assert(conference != NULL);
-
-       switch_mutex_lock(conference->mutex);
-
-       if (stop == FILE_STOP_ALL) {
-               for (nptr = conference->fnode; nptr; nptr = nptr->next) {
-                       nptr->done++;
-                       count++;
-               }
-               if (conference->async_fnode) {
-                       conference->async_fnode->done++;
-                       count++;
-               }
-       } else if (stop == FILE_STOP_ASYNC) {
-               if (conference->async_fnode) {
-                       conference->async_fnode->done++;
-                       count++;
-               }
-       } else {
-               if (conference->fnode) {
-                       conference->fnode->done++;
-                       count++;
-               }
-       }
-
-       switch_mutex_unlock(conference->mutex);
-
-       return count;
+    uint32_t count = 0;
+    conference_file_node_t *nptr;
+
+    switch_assert(conference != NULL);
+
+    switch_mutex_lock(conference->mutex);
+
+    if (stop == FILE_STOP_ALL) {
+        for (nptr = conference->fnode; nptr; nptr = nptr->next) {
+            nptr->done++;
+            count++;
+        }
+        if (conference->async_fnode) {
+            conference->async_fnode->done++;
+            count++;
+        }
+    } else if (stop == FILE_STOP_ASYNC) {
+        if (conference->async_fnode) {
+            conference->async_fnode->done++;
+            count++;
+        }
+    } else {
+        if (conference->fnode) {
+            conference->fnode->done++;
+            count++;
+        }
+    }
+
+    switch_mutex_unlock(conference->mutex);
+
+    return count;
 }
 
 /* stop playing a file for the member of the conference */
 static uint32_t conference_member_stop_file(conference_member_t *member, file_stop_t stop)
 {
-       conference_file_node_t *nptr;
-       uint32_t count = 0;
+    conference_file_node_t *nptr;
+    uint32_t count = 0;
 
-       if (member == NULL)
-               return count;
+    if (member == NULL)
+        return count;
 
-       switch_mutex_lock(member->flag_mutex);
+    switch_mutex_lock(member->flag_mutex);
 
-       if (stop == FILE_STOP_ALL) {
-               for (nptr = member->fnode; nptr; nptr = nptr->next) {
-                       nptr->done++;
-                       count++;
-               }
-       } else {
-               if (member->fnode) {
-                       member->fnode->done++;
-                       count++;
-               }
-       }
+    if (stop == FILE_STOP_ALL) {
+        for (nptr = member->fnode; nptr; nptr = nptr->next) {
+            nptr->done++;
+            count++;
+        }
+    } else {
+        if (member->fnode) {
+            member->fnode->done++;
+            count++;
+        }
+    }
 
-       switch_mutex_unlock(member->flag_mutex);
+    switch_mutex_unlock(member->flag_mutex);
 
-       return count;
+    return count;
 }
 
 /* Play a file in the conference room */
 static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async)
 {
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       conference_file_node_t *fnode, *nptr = NULL;
-       switch_memory_pool_t *pool;
-       uint32_t count;
-       char *dfile = NULL, *expanded = NULL;
-
-       switch_assert(conference != NULL);
-
-       switch_mutex_lock(conference->mutex);
-       switch_mutex_lock(conference->member_mutex);
-       count = conference->count;
-       switch_mutex_unlock(conference->member_mutex);
-       switch_mutex_unlock(conference->mutex);
-
-       if (!count)
-               return SWITCH_STATUS_FALSE;
-
-       if (channel) {
-               if ((expanded = switch_channel_expand_variables(channel, file)) != file) {
-                       file = expanded;
-               } else {
-                       expanded = NULL;
-               }
-       }
-
-       if (!async && !strncasecmp(file, "say:", 4)) {
-               status = conference_say(conference, file + 4, leadin);
-               goto done;
-       }
-
-       if (!switch_is_file_path(file)) {
-               if (conference->sound_prefix) {
-                       if (!(dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) {
-                               goto done;
-                       }
-                       file = dfile;
-               } else if (!async) {
-                       status = conference_say(conference, file, leadin);
-                       goto done;
-               } else {
-                       goto done;
-               }
-       }
-
-       /* Setup a memory pool to use. */
-       if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-               status = SWITCH_STATUS_MEMERR;
-               goto done;
-       }
-
-       /* Create a node object */
-       if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
-               switch_core_destroy_memory_pool(&pool);
-               status = SWITCH_STATUS_MEMERR;
-               goto done;
-       }
-
-       fnode->type = NODE_TYPE_FILE;
-       fnode->leadin = leadin;
-
-       /* Open the file */
-       if (switch_core_file_open(&fnode->fh, file, (uint8_t) 1, conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, pool) !=
-               SWITCH_STATUS_SUCCESS) {
-               switch_core_destroy_memory_pool(&pool);
-               status = SWITCH_STATUS_NOTFOUND;
-               goto done;
-       }
-
-       fnode->pool = pool;
-       fnode->async = async;
-       /* Queue the node */
-       switch_mutex_lock(conference->mutex);
-
-       if (async) {
-               if (conference->async_fnode) {
-                       nptr = conference->async_fnode;
-               }
-               conference->async_fnode = fnode;
-
-               if (nptr) {
-                       switch_memory_pool_t *tmppool;
-                       switch_core_file_close(&nptr->fh);
-                       tmppool = nptr->pool;
-                       switch_core_destroy_memory_pool(&tmppool);
-               }
-
-       } else {
-               for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next);
-
-               if (nptr) {
-                       nptr->next = fnode;
-               } else {
-                       conference->fnode = fnode;
-               }
-       }
-
-       switch_mutex_unlock(conference->mutex);
-
 done:
-
-       switch_safe_free(expanded);
-       switch_safe_free(dfile);
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    conference_file_node_t *fnode, *nptr = NULL;
+    switch_memory_pool_t *pool;
+    uint32_t count;
+    char *dfile = NULL, *expanded = NULL;
+
+    switch_assert(conference != NULL);
+
+    switch_mutex_lock(conference->mutex);
+    switch_mutex_lock(conference->member_mutex);
+    count = conference->count;
+    switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(conference->mutex);
+
+    if (!count)
+        return SWITCH_STATUS_FALSE;
+
+    if (channel) {
+        if ((expanded = switch_channel_expand_variables(channel, file)) != file) {
+            file = expanded;
+        } else {
+            expanded = NULL;
+        }
+    }
+
+    if (!async && !strncasecmp(file, "say:", 4)) {
+        status = conference_say(conference, file + 4, leadin);
+        goto done;
+    }
+
+    if (!switch_is_file_path(file)) {
+        if (conference->sound_prefix) {
+            if (!(dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) {
+                goto done;
+            }
+            file = dfile;
+        } else if (!async) {
+            status = conference_say(conference, file, leadin);
+            goto done;
+        } else {
+            goto done;
+        }
+    }
+
+    /* Setup a memory pool to use. */
+    if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+        status = SWITCH_STATUS_MEMERR;
+        goto done;
+    }
+
+    /* Create a node object */
+    if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+        switch_core_destroy_memory_pool(&pool);
+        status = SWITCH_STATUS_MEMERR;
+        goto done;
+    }
+
+    fnode->type = NODE_TYPE_FILE;
+    fnode->leadin = leadin;
+
+    /* Open the file */
+    if (switch_core_file_open(&fnode->fh, file, (uint8_t) 1, conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, pool) !=
+        SWITCH_STATUS_SUCCESS) {
+        switch_core_destroy_memory_pool(&pool);
+        status = SWITCH_STATUS_NOTFOUND;
+        goto done;
+    }
+
+    fnode->pool = pool;
+    fnode->async = async;
+    /* Queue the node */
+    switch_mutex_lock(conference->mutex);
+
+    if (async) {
+        if (conference->async_fnode) {
+            nptr = conference->async_fnode;
+        }
+        conference->async_fnode = fnode;
+
+        if (nptr) {
+            switch_memory_pool_t *tmppool;
+            switch_core_file_close(&nptr->fh);
+            tmppool = nptr->pool;
+            switch_core_destroy_memory_pool(&tmppool);
+        }
+
+    } else {
+        for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next);
+
+        if (nptr) {
+            nptr->next = fnode;
+        } else {
+            conference->fnode = fnode;
+        }
+    }
+
+    switch_mutex_unlock(conference->mutex);
+
+ done:
+
+    switch_safe_free(expanded);
+    switch_safe_free(dfile);
+
+    return status;
 }
 
 /* Play a file in the conference room to a member */
 static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       char *dfile = NULL, *expanded = NULL;
-       conference_file_node_t *fnode, *nptr = NULL;
-       switch_memory_pool_t *pool;
-
-       if (member == NULL || file == NULL)
-               return status;
-
-       if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) {
-               file = expanded;
-       } else {
-               expanded = NULL;
-       }
-       if (!strncasecmp(file, "say:", 4)) {
-               if (!switch_strlen_zero(file + 4)) {
-                       status = conference_member_say(member, file + 4, leadin);
-               }
-               goto done;
-       }
-       if (!switch_is_file_path(file)) {
-               if (member->conference->sound_prefix) {
-                       if (!(dfile = switch_mprintf("%s%s%s", member->conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) {
-                               goto done;
-                       }
-                       file = dfile;
-               } else if (!switch_strlen_zero(file)) {
-                       status = conference_member_say(member, file, leadin);
-                       goto done;
-               }
-       }
-       /* Setup a memory pool to use. */
-       if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-               status = SWITCH_STATUS_MEMERR;
-               goto done;
-       }
-       /* Create a node object */
-       if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
-               switch_core_destroy_memory_pool(&pool);
-               status = SWITCH_STATUS_MEMERR;
-               goto done;
-       }
-       fnode->type = NODE_TYPE_FILE;
-       fnode->leadin = leadin;
-       /* Open the file */
-       if (switch_core_file_open(&fnode->fh,
-                                                         file, (uint8_t) 1, member->conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT,
-                                                         pool) != SWITCH_STATUS_SUCCESS) {
-               switch_core_destroy_memory_pool(&pool);
-               status = SWITCH_STATUS_NOTFOUND;
-               goto done;
-       }
-       fnode->pool = pool;
-       /* Queue the node */
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file);
-       switch_mutex_lock(member->flag_mutex);
-       for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);
-       if (nptr) {
-               nptr->next = fnode;
-       } else {
-               member->fnode = fnode;
-       }
-       switch_mutex_unlock(member->flag_mutex);
-       status = SWITCH_STATUS_SUCCESS;
-
 done:
-
-       switch_safe_free(expanded);
-       switch_safe_free(dfile);
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    char *dfile = NULL, *expanded = NULL;
+    conference_file_node_t *fnode, *nptr = NULL;
+    switch_memory_pool_t *pool;
+
+    if (member == NULL || file == NULL)
+        return status;
+
+    if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) {
+        file = expanded;
+    } else {
+        expanded = NULL;
+    }
+    if (!strncasecmp(file, "say:", 4)) {
+        if (!switch_strlen_zero(file + 4)) {
+            status = conference_member_say(member, file + 4, leadin);
+        }
+        goto done;
+    }
+    if (!switch_is_file_path(file)) {
+        if (member->conference->sound_prefix) {
+            if (!(dfile = switch_mprintf("%s%s%s", member->conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) {
+                goto done;
+            }
+            file = dfile;
+        } else if (!switch_strlen_zero(file)) {
+            status = conference_member_say(member, file, leadin);
+            goto done;
+        }
+    }
+    /* Setup a memory pool to use. */
+    if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+        status = SWITCH_STATUS_MEMERR;
+        goto done;
+    }
+    /* Create a node object */
+    if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+        switch_core_destroy_memory_pool(&pool);
+        status = SWITCH_STATUS_MEMERR;
+        goto done;
+    }
+    fnode->type = NODE_TYPE_FILE;
+    fnode->leadin = leadin;
+    /* Open the file */
+    if (switch_core_file_open(&fnode->fh,
+                              file, (uint8_t) 1, member->conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT,
+                              pool) != SWITCH_STATUS_SUCCESS) {
+        switch_core_destroy_memory_pool(&pool);
+        status = SWITCH_STATUS_NOTFOUND;
+        goto done;
+    }
+    fnode->pool = pool;
+    /* Queue the node */
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file);
+    switch_mutex_lock(member->flag_mutex);
+    for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);
+    if (nptr) {
+        nptr->next = fnode;
+    } else {
+        member->fnode = fnode;
+    }
+    switch_mutex_unlock(member->flag_mutex);
+    status = SWITCH_STATUS_SUCCESS;
+
+ done:
+
+    switch_safe_free(expanded);
+    switch_safe_free(dfile);
+
+    return status;
 }
 
 /* Say some thing with TTS in the conference room */
 static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin)
 {
-       conference_obj_t *conference = (member != NULL ? member->conference : NULL);
-       conference_file_node_t *fnode, *nptr;
-       switch_memory_pool_t *pool;
-       switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-       switch_status_t status = SWITCH_STATUS_FALSE;
-
-       if (member == NULL || switch_strlen_zero(text))
-               return SWITCH_STATUS_FALSE;
-
-       switch_assert(conference != NULL);
-
-       if (!(conference->tts_engine && conference->tts_voice)) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       /* Setup a memory pool to use. */
-       if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-               return SWITCH_STATUS_MEMERR;
-       }
-
-       /* Create a node object */
-       if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
-               switch_core_destroy_memory_pool(&pool);
-               return SWITCH_STATUS_MEMERR;
-       }
-
-       fnode->type = NODE_TYPE_SPEECH;
-       fnode->leadin = leadin;
-       fnode->pool = pool;
-
-       if (!member->sh) {
-               memset(&member->lsh, 0, sizeof(member->lsh));
-               if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice,
-                                                                       conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) !=
-                       SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
-                       return SWITCH_STATUS_FALSE;
-               }
-               member->sh = &member->lsh;
-       }
-
-       /* Queue the node */
-       switch_mutex_lock(member->flag_mutex);
-       for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);
-
-       if (nptr) {
-               nptr->next = fnode;
-       } else {
-               member->fnode = fnode;
-       }
-
-       fnode->sh = member->sh;
-       /* Begin Generation */
-       switch_sleep(200000);
-
-       if (*text == '#') {
-               char *tmp = (char *) text + 1;
-               char *vp = tmp, voice[128] = "";
-               if ((tmp = strchr(tmp, '#'))) {
-                       text = tmp + 1;
-                       switch_copy_string(voice, vp, (tmp - vp) + 1);
-                       switch_core_speech_text_param_tts(fnode->sh, "voice", voice);
-               }
-       } else {
-               switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice);
-       }
-
-       switch_core_speech_feed_tts(fnode->sh, text, &flags);
-       switch_mutex_unlock(member->flag_mutex);
-
-       status = SWITCH_STATUS_SUCCESS;
-
-       return status;
+    conference_obj_t *conference = (member != NULL ? member->conference : NULL);
+    conference_file_node_t *fnode, *nptr;
+    switch_memory_pool_t *pool;
+    switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+
+    if (member == NULL || switch_strlen_zero(text))
+        return SWITCH_STATUS_FALSE;
+
+    switch_assert(conference != NULL);
+
+    if (!(conference->tts_engine && conference->tts_voice)) {
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    /* Setup a memory pool to use. */
+    if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    /* Create a node object */
+    if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+        switch_core_destroy_memory_pool(&pool);
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    fnode->type = NODE_TYPE_SPEECH;
+    fnode->leadin = leadin;
+    fnode->pool = pool;
+
+    if (!member->sh) {
+        memset(&member->lsh, 0, sizeof(member->lsh));
+        if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice,
+                                    conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) !=
+            SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
+            return SWITCH_STATUS_FALSE;
+        }
+        member->sh = &member->lsh;
+    }
+
+    /* Queue the node */
+    switch_mutex_lock(member->flag_mutex);
+    for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);
+
+    if (nptr) {
+        nptr->next = fnode;
+    } else {
+        member->fnode = fnode;
+    }
+
+    fnode->sh = member->sh;
+    /* Begin Generation */
+    switch_sleep(200000);
+
+    if (*text == '#') {
+        char *tmp = (char *) text + 1;
+        char *vp = tmp, voice[128] = "";
+        if ((tmp = strchr(tmp, '#'))) {
+            text = tmp + 1;
+            switch_copy_string(voice, vp, (tmp - vp) + 1);
+            switch_core_speech_text_param_tts(fnode->sh, "voice", voice);
+        }
+    } else {
+        switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice);
+    }
+
+    switch_core_speech_feed_tts(fnode->sh, text, &flags);
+    switch_mutex_unlock(member->flag_mutex);
+
+    status = SWITCH_STATUS_SUCCESS;
+
+    return status;
 }
 
 /* Say some thing with TTS in the conference room */
 static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       conference_file_node_t *fnode, *nptr;
-       switch_memory_pool_t *pool;
-       switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-       uint32_t count;
-
-       switch_assert(conference != NULL);
-
-       if (switch_strlen_zero(text)) {
-               return SWITCH_STATUS_GENERR;
-       }
-
-       switch_mutex_lock(conference->mutex);
-       switch_mutex_lock(conference->member_mutex);
-       count = conference->count;
-       if (!(conference->tts_engine && conference->tts_voice)) {
-               count = 0;
-       }
-       switch_mutex_unlock(conference->member_mutex);
-       switch_mutex_unlock(conference->mutex);
-
-       if (!count) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       /* Setup a memory pool to use. */
-       if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-               return SWITCH_STATUS_MEMERR;
-       }
-
-       /* Create a node object */
-       if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
-               switch_core_destroy_memory_pool(&pool);
-               return SWITCH_STATUS_MEMERR;
-       }
-
-       fnode->type = NODE_TYPE_SPEECH;
-       fnode->leadin = leadin;
-
-       if (!conference->sh) {
-               memset(&conference->lsh, 0, sizeof(conference->lsh));
-               if (switch_core_speech_open(&conference->lsh, conference->tts_engine, conference->tts_voice,
-                                                                       conference->rate, conference->interval, &flags, conference->pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
-                       return SWITCH_STATUS_FALSE;
-               }
-               conference->sh = &conference->lsh;
-       }
-
-       fnode->pool = pool;
-
-       /* Queue the node */
-       switch_mutex_lock(conference->mutex);
-       for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next);
-
-       if (nptr) {
-               nptr->next = fnode;
-       } else {
-               conference->fnode = fnode;
-       }
-
-       fnode->sh = conference->sh;
-       if (*text == '#') {
-               char *tmp = (char *) text + 1;
-               char *vp = tmp, voice[128] = "";
-               if ((tmp = strchr(tmp, '#'))) {
-                       text = tmp + 1;
-                       switch_copy_string(voice, vp, (tmp - vp) + 1);
-                       switch_core_speech_text_param_tts(fnode->sh, "voice", voice);
-               }
-       } else {
-               switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice);
-       }
-
-       /* Begin Generation */
-       switch_sleep(200000);
-       switch_core_speech_feed_tts(fnode->sh, (char *) text, &flags);
-       switch_mutex_unlock(conference->mutex);
-       status = SWITCH_STATUS_SUCCESS;
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    conference_file_node_t *fnode, *nptr;
+    switch_memory_pool_t *pool;
+    switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
+    uint32_t count;
+
+    switch_assert(conference != NULL);
+
+    if (switch_strlen_zero(text)) {
+        return SWITCH_STATUS_GENERR;
+    }
+
+    switch_mutex_lock(conference->mutex);
+    switch_mutex_lock(conference->member_mutex);
+    count = conference->count;
+    if (!(conference->tts_engine && conference->tts_voice)) {
+        count = 0;
+    }
+    switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(conference->mutex);
+
+    if (!count) {
+        return SWITCH_STATUS_FALSE;
+    }
+
+    /* Setup a memory pool to use. */
+    if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    /* Create a node object */
+    if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+        switch_core_destroy_memory_pool(&pool);
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    fnode->type = NODE_TYPE_SPEECH;
+    fnode->leadin = leadin;
+
+    if (!conference->sh) {
+        memset(&conference->lsh, 0, sizeof(conference->lsh));
+        if (switch_core_speech_open(&conference->lsh, conference->tts_engine, conference->tts_voice,
+                                    conference->rate, conference->interval, &flags, conference->pool) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
+            return SWITCH_STATUS_FALSE;
+        }
+        conference->sh = &conference->lsh;
+    }
+
+    fnode->pool = pool;
+
+    /* Queue the node */
+    switch_mutex_lock(conference->mutex);
+    for (nptr = conference->fnode; nptr && nptr->next; nptr = nptr->next);
+
+    if (nptr) {
+        nptr->next = fnode;
+    } else {
+        conference->fnode = fnode;
+    }
+
+    fnode->sh = conference->sh;
+    if (*text == '#') {
+        char *tmp = (char *) text + 1;
+        char *vp = tmp, voice[128] = "";
+        if ((tmp = strchr(tmp, '#'))) {
+            text = tmp + 1;
+            switch_copy_string(voice, vp, (tmp - vp) + 1);
+            switch_core_speech_text_param_tts(fnode->sh, "voice", voice);
+        }
+    } else {
+        switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice);
+    }
+
+    /* Begin Generation */
+    switch_sleep(200000);
+    switch_core_speech_feed_tts(fnode->sh, (char *) text, &flags);
+    switch_mutex_unlock(conference->mutex);
+    status = SWITCH_STATUS_SUCCESS;
+
+    return status;
 }
 
 /* execute a callback for every member of the conference */
 static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, conf_api_member_cmd_t pfncallback, void *data)
 {
-       conference_member_t *member = NULL;
+    conference_member_t *member = NULL;
 
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-       switch_assert(pfncallback != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+    switch_assert(pfncallback != NULL);
 
-       switch_mutex_lock(conference->member_mutex);
-       for (member = conference->members; member; member = member->next) {
-               pfncallback(member, stream, data);
-       }
-       switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_lock(conference->member_mutex);
+    for (member = conference->members; member; member = member->next) {
+        pfncallback(member, stream, data);
+    }
+    switch_mutex_unlock(conference->member_mutex);
 }
 
 static void conference_list_pretty(conference_obj_t *conference, switch_stream_handle_t *stream)
 {
-       conference_member_t *member = NULL;
+    conference_member_t *member = NULL;
 
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
 
-       switch_mutex_lock(conference->member_mutex);
+    switch_mutex_lock(conference->member_mutex);
 
-       for (member = conference->members; member; member = member->next) {
-               switch_channel_t *channel;
-               switch_caller_profile_t *profile;
+    for (member = conference->members; member; member = member->next) {
+        switch_channel_t *channel;
+        switch_caller_profile_t *profile;
 
-               if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
-                       continue;
-               }
-               channel = switch_core_session_get_channel(member->session);
-               profile = switch_channel_get_caller_profile(channel);
+        if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
+            continue;
+        }
+        channel = switch_core_session_get_channel(member->session);
+        profile = switch_channel_get_caller_profile(channel);
 
-               stream->write_function(stream, "%u) %s (%s)\n", member->id, profile->caller_id_name, profile->caller_id_number);
-       }
+        stream->write_function(stream, "%u) %s (%s)\n", member->id, profile->caller_id_name, profile->caller_id_number);
+    }
 
-       switch_mutex_unlock(conference->member_mutex);
+    switch_mutex_unlock(conference->member_mutex);
 }
 
 static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim)
 {
-       conference_member_t *member = NULL;
-
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-       switch_assert(delim != NULL);
-
-       switch_mutex_lock(conference->member_mutex);
-
-       for (member = conference->members; member; member = member->next) {
-               switch_channel_t *channel;
-               switch_caller_profile_t *profile;
-               char *uuid;
-               char *name;
-               uint32_t count = 0;
-
-               if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
-                       continue;
-               }
-
-               uuid = switch_core_session_get_uuid(member->session);
-               channel = switch_core_session_get_channel(member->session);
-               profile = switch_channel_get_caller_profile(channel);
-               name = switch_channel_get_name(channel);
-
-               stream->write_function(stream, "%u%s%s%s%s%s%s%s%s%s",
-                                                          member->id, delim, name, delim, uuid, delim, profile->caller_id_name, delim, profile->caller_id_number, delim);
-
-               if (switch_test_flag(member, MFLAG_CAN_HEAR)) {
-                       stream->write_function(stream, "hear");
-                       count++;
-               }
-
-               if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
-                       stream->write_function(stream, "%s%s", count ? "|" : "", "speak");
-                       count++;
-               }
-
-               if (switch_test_flag(member, MFLAG_TALKING)) {
-                       stream->write_function(stream, "%s%s", count ? "|" : "", "talking");
-                       count++;
-               }
-
-               if (switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_VIDEO)) {
-                       stream->write_function(stream, "%s%s", count ? "|" : "", "video");
-                       count++;
-               }
-
-               if (member == member->conference->floor_holder) {
-                       stream->write_function(stream, "%s%s", count ? "|" : "", "floor");
-                       count++;
-               }
-
-               stream->write_function(stream, "%s%d%s%d%s%d\n", delim, member->volume_in_level, delim, member->volume_out_level, delim, member->energy_level);
-       }
-
-       switch_mutex_unlock(conference->member_mutex);
+    conference_member_t *member = NULL;
+
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+    switch_assert(delim != NULL);
+
+    switch_mutex_lock(conference->member_mutex);
+
+    for (member = conference->members; member; member = member->next) {
+        switch_channel_t *channel;
+        switch_caller_profile_t *profile;
+        char *uuid;
+        char *name;
+        uint32_t count = 0;
+
+        if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
+            continue;
+        }
+
+        uuid = switch_core_session_get_uuid(member->session);
+        channel = switch_core_session_get_channel(member->session);
+        profile = switch_channel_get_caller_profile(channel);
+        name = switch_channel_get_name(channel);
+
+        stream->write_function(stream, "%u%s%s%s%s%s%s%s%s%s",
+                               member->id, delim, name, delim, uuid, delim, profile->caller_id_name, delim, profile->caller_id_number, delim);
+
+        if (switch_test_flag(member, MFLAG_CAN_HEAR)) {
+            stream->write_function(stream, "hear");
+            count++;
+        }
+
+        if (switch_test_flag(member, MFLAG_CAN_SPEAK)) {
+            stream->write_function(stream, "%s%s", count ? "|" : "", "speak");
+            count++;
+        }
+
+        if (switch_test_flag(member, MFLAG_TALKING)) {
+            stream->write_function(stream, "%s%s", count ? "|" : "", "talking");
+            count++;
+        }
+
+        if (switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_VIDEO)) {
+            stream->write_function(stream, "%s%s", count ? "|" : "", "video");
+            count++;
+        }
+
+        if (member == member->conference->floor_holder) {
+            stream->write_function(stream, "%s%s", count ? "|" : "", "floor");
+            count++;
+        }
+
+        stream->write_function(stream, "%s%d%s%d%s%d\n", delim, member->volume_in_level, delim, member->volume_out_level, delim, member->energy_level);
+    }
+
+    switch_mutex_unlock(conference->member_mutex);
 }
 
 static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
-       if (!switch_strlen_zero(member->conference->muted_sound)) {
-               conference_member_play_file(member, member->conference->muted_sound, 0);
-       } else {
-               char msg[512];
-
-               switch_snprintf(msg, sizeof(msg), "Muted");
-               conference_member_say(member, msg, 0);
-       }
-       if (stream != NULL) {
-               stream->write_function(stream, "OK mute %u\n", member->id);
-       }
-       if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "mute-member");
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
+    if (!switch_strlen_zero(member->conference->muted_sound)) {
+        conference_member_play_file(member, member->conference->muted_sound, 0);
+    } else {
+        char msg[512];
+
+        switch_snprintf(msg, sizeof(msg), "Muted");
+        conference_member_say(member, msg, 0);
+    }
+    if (stream != NULL) {
+        stream->write_function(stream, "OK mute %u\n", member->id);
+    }
+    if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "mute-member");
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_unmute(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       switch_set_flag_locked(member, MFLAG_CAN_SPEAK);
-       if (stream != NULL) {
-               stream->write_function(stream, "OK unmute %u\n", member->id);
-       }
-       if (!switch_strlen_zero(member->conference->unmuted_sound)) {
-               conference_member_play_file(member, member->conference->unmuted_sound, 0);
-       } else {
-               char msg[512];
-
-               switch_snprintf(msg, sizeof(msg), "Un-Muted");
-               conference_member_say(member, msg, 0);
-       }
-       if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member");
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    switch_set_flag_locked(member, MFLAG_CAN_SPEAK);
+    if (stream != NULL) {
+        stream->write_function(stream, "OK unmute %u\n", member->id);
+    }
+    if (!switch_strlen_zero(member->conference->unmuted_sound)) {
+        conference_member_play_file(member, member->conference->unmuted_sound, 0);
+    } else {
+        char msg[512];
+
+        switch_snprintf(msg, sizeof(msg), "Un-Muted");
+        conference_member_say(member, msg, 0);
+    }
+    if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member");
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_deaf(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       switch_clear_flag_locked(member, MFLAG_CAN_HEAR);
-       if (stream != NULL) {
-               stream->write_function(stream, "OK deaf %u\n", member->id);
-       }
-       if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member");
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    switch_clear_flag_locked(member, MFLAG_CAN_HEAR);
+    if (stream != NULL) {
+        stream->write_function(stream, "OK deaf %u\n", member->id);
+    }
+    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member");
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_undeaf(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       switch_set_flag_locked(member, MFLAG_CAN_HEAR);
-       if (stream != NULL) {
-               stream->write_function(stream, "OK undeaf %u\n", member->id);
-       }
-       if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member");
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    switch_set_flag_locked(member, MFLAG_CAN_HEAR);
+    if (stream != NULL) {
+        stream->write_function(stream, "OK undeaf %u\n", member->id);
+    }
+    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member");
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_kick(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       switch_mutex_lock(member->flag_mutex);
-       switch_clear_flag(member, MFLAG_RUNNING);
-       switch_set_flag(member, MFLAG_KICKED);
-       switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
-       switch_mutex_unlock(member->flag_mutex);
-       if (stream != NULL) {
-               stream->write_function(stream, "OK kicked %u\n", member->id);
-       }
-       if (member->conference && test_eflag(member->conference, EFLAG_KICK_MEMBER)) {
-               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                       conference_add_event_member_data(member, event);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "kick-member");
-                       switch_event_fire(&event);
-               }
-       }
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    switch_mutex_lock(member->flag_mutex);
+    switch_clear_flag(member, MFLAG_RUNNING);
+    switch_set_flag(member, MFLAG_KICKED);
+    switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
+    switch_mutex_unlock(member->flag_mutex);
+    if (stream != NULL) {
+        stream->write_function(stream, "OK kicked %u\n", member->id);
+    }
+    if (member->conference && test_eflag(member->conference, EFLAG_KICK_MEMBER)) {
+        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+            conference_add_event_member_data(member, event);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "kick-member");
+            switch_event_fire(&event);
+        }
+    }
+    return SWITCH_STATUS_SUCCESS;
 }
 
 
 static switch_status_t conf_api_sub_dtmf(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-       char *dtmf = (char *) data;
-
-       if (member == NULL) {
-               stream->write_function(stream, "Invalid member!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       if (switch_strlen_zero(dtmf)) {
-               stream->write_function(stream, "Invalid input!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       switch_mutex_lock(member->flag_mutex);
-       switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
-       switch_core_session_send_dtmf_string(member->session, (char *) data);
-       switch_mutex_unlock(member->flag_mutex);
-
-       if (stream != NULL) {
-               stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id);
-       }
-
-       if (test_eflag(member->conference, EFLAG_DTMF_MEMBER) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Digits", dtmf);
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+    char *dtmf = (char *) data;
+
+    if (member == NULL) {
+        stream->write_function(stream, "Invalid member!\n");
+        return SWITCH_STATUS_GENERR;
+    }
+
+    if (switch_strlen_zero(dtmf)) {
+        stream->write_function(stream, "Invalid input!\n");
+        return SWITCH_STATUS_GENERR;
+    }
+
+    switch_mutex_lock(member->flag_mutex);
+    switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
+    switch_core_session_send_dtmf_string(member->session, (char *) data);
+    switch_mutex_unlock(member->flag_mutex);
+
+    if (stream != NULL) {
+        stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id);
+    }
+
+    if (test_eflag(member->conference, EFLAG_DTMF_MEMBER) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Digits", dtmf);
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_energy(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       if (data) {
-               switch_mutex_lock(member->flag_mutex);
-               member->energy_level = atoi((char *) data);
-               switch_mutex_unlock(member->flag_mutex);
-       }
-       if (stream != NULL) {
-               stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level);
-       }
-       if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL_MEMBER) &&
-               data && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level);
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    if (data) {
+        switch_mutex_lock(member->flag_mutex);
+        member->energy_level = atoi((char *) data);
+        switch_mutex_unlock(member->flag_mutex);
+    }
+    if (stream != NULL) {
+        stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level);
+    }
+    if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL_MEMBER) &&
+        data && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level);
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_volume_in(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       if (data) {
-               switch_mutex_lock(member->flag_mutex);
-               member->volume_in_level = atoi((char *) data);
-               switch_normalize_volume(member->volume_in_level);
-               switch_mutex_unlock(member->flag_mutex);
-       }
-       if (stream != NULL) {
-               stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level);
-       }
-       if (test_eflag(member->conference, EFLAG_VOLUME_IN_MEMBER) &&
-               data && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level);
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    if (data) {
+        switch_mutex_lock(member->flag_mutex);
+        member->volume_in_level = atoi((char *) data);
+        switch_normalize_volume(member->volume_in_level);
+        switch_mutex_unlock(member->flag_mutex);
+    }
+    if (stream != NULL) {
+        stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level);
+    }
+    if (test_eflag(member->conference, EFLAG_VOLUME_IN_MEMBER) &&
+        data && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level);
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_volume_out(conference_member_t *member, switch_stream_handle_t *stream, void *data)
 {
-       switch_event_t *event;
-
-       if (member == NULL)
-               return SWITCH_STATUS_GENERR;
-
-       if (data) {
-               switch_mutex_lock(member->flag_mutex);
-               member->volume_out_level = atoi((char *) data);
-               switch_normalize_volume(member->volume_out_level);
-               switch_mutex_unlock(member->flag_mutex);
-       }
-       if (stream != NULL) {
-               stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level);
-       }
-       if (test_eflag(member->conference, EFLAG_VOLUME_OUT_MEMBER) && data &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level);
-               switch_event_fire(&event);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (member == NULL)
+        return SWITCH_STATUS_GENERR;
+
+    if (data) {
+        switch_mutex_lock(member->flag_mutex);
+        member->volume_out_level = atoi((char *) data);
+        switch_normalize_volume(member->volume_out_level);
+        switch_mutex_unlock(member->flag_mutex);
+    }
+    if (stream != NULL) {
+        stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level);
+    }
+    if (test_eflag(member->conference, EFLAG_VOLUME_OUT_MEMBER) && data &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level);
+        switch_event_fire(&event);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_list(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       int ret_status = SWITCH_STATUS_GENERR;
-       int count = 0;
-       switch_hash_index_t *hi;
-       void *val;
-       char *d = ";";
-       int pretty = 0;
-       int argofs = (argc >= 2 && strcasecmp(argv[1], "list") == 0);   /* detect being called from chat vs. api */
-
-       if (argv[1 + argofs]) {
-               if (argv[2 + argofs] && !strcasecmp(argv[1 + argofs], "delim")) {
-                       d = argv[2 + argofs];
-
-                       if (*d == '"') {
-                               if (++d) {
-                                       char *p;
-                                       if ((p = strchr(d, '"'))) {
-                                               *p = '\0';
-                                       }
-                               } else {
-                                       d = ";";
-                               }
-                       }
-               } else if (strcasecmp(argv[1 + argofs], "pretty") == 0) {
-                       pretty = 1;
-               }
-       }
-
-       if (conference == NULL) {
-               for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) {
-                       switch_hash_this(hi, NULL, NULL, &val);
-                       conference = (conference_obj_t *) val;
-
-                       stream->write_function(stream, "Conference %s (%u member%s%s)\n",
-                                                                  conference->name,
-                                                                  conference->count, conference->count == 1 ? "" : "s", switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : "");
-                       count++;
-                       if (pretty) {
-                               conference_list_pretty(conference, stream);
-                       } else {
-                               conference_list(conference, stream, d);
-                       }
-               }
-       } else {
-               count++;
-               if (pretty) {
-                       conference_list_pretty(conference, stream);
-               } else {
-                       conference_list(conference, stream, d);
-               }
-       }
-
-       if (!count) {
-               stream->write_function(stream, "No active conferences.\n");
-       }
-
-       ret_status = SWITCH_STATUS_SUCCESS;
-
-       return ret_status;
+    int ret_status = SWITCH_STATUS_GENERR;
+    int count = 0;
+    switch_hash_index_t *hi;
+    void *val;
+    char *d = ";";
+    int pretty = 0;
+    int argofs = (argc >= 2 && strcasecmp(argv[1], "list") == 0);   /* detect being called from chat vs. api */
+
+    if (argv[1 + argofs]) {
+        if (argv[2 + argofs] && !strcasecmp(argv[1 + argofs], "delim")) {
+            d = argv[2 + argofs];
+
+            if (*d == '"') {
+                if (++d) {
+                    char *p;
+                    if ((p = strchr(d, '"'))) {
+                        *p = '\0';
+                    }
+                } else {
+                    d = ";";
+                }
+            }
+        } else if (strcasecmp(argv[1 + argofs], "pretty") == 0) {
+            pretty = 1;
+        }
+    }
+
+    if (conference == NULL) {
+        for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) {
+            switch_hash_this(hi, NULL, NULL, &val);
+            conference = (conference_obj_t *) val;
+
+            stream->write_function(stream, "Conference %s (%u member%s%s)\n",
+                                   conference->name,
+                                   conference->count, conference->count == 1 ? "" : "s", switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : "");
+            count++;
+            if (pretty) {
+                conference_list_pretty(conference, stream);
+            } else {
+                conference_list(conference, stream, d);
+            }
+        }
+    } else {
+        count++;
+        if (pretty) {
+            conference_list_pretty(conference, stream);
+        } else {
+            conference_list(conference, stream, d);
+        }
+    }
+
+    if (!count) {
+        stream->write_function(stream, "No active conferences.\n");
+    }
+
+    ret_status = SWITCH_STATUS_SUCCESS;
+
+    return ret_status;
 }
 
 static switch_status_t conf_api_sub_play(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       int ret_status = SWITCH_STATUS_GENERR;
-       switch_event_t *event;
-       uint8_t async = 0;
-
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       if ((argc == 4 && !strcasecmp(argv[3], "async")) || (argc == 5 && !strcasecmp(argv[4], "async"))) {
-               argc--;
-               async++;
-       }
-
-       if (argc == 3) {
-               if (conference_play_file(conference, argv[2], 0, NULL, async) == SWITCH_STATUS_SUCCESS) {
-                       stream->write_function(stream, "(play) Playing file %s\n", argv[2]);
-                       if (test_eflag(conference, EFLAG_PLAY_FILE) &&
-                               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                               conference_add_event_data(conference, event);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]);
-                               switch_event_fire(&event);
-                       }
-               } else {
-                       stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)");
-               }
-               ret_status = SWITCH_STATUS_SUCCESS;
-       } else if (argc == 4) {
-               uint32_t id = atoi(argv[3]);
-               conference_member_t *member;
-
-               if ((member = conference_member_get(conference, id))) {
-                       if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) {
-                               stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id);
-                               if (test_eflag(conference, EFLAG_PLAY_FILE_MEMBER) &&
-                                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                                       conference_add_event_member_data(member, event);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member");
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]);
-                                       switch_event_fire(&event);
-                               }
-                       } else {
-                               stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)");
-                       }
-                       ret_status = SWITCH_STATUS_SUCCESS;
-               } else {
-                       stream->write_function(stream, "Member: %u not found.\n", id);
-               }
-       }
-
-       return ret_status;
+    int ret_status = SWITCH_STATUS_GENERR;
+    switch_event_t *event;
+    uint8_t async = 0;
+
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    if ((argc == 4 && !strcasecmp(argv[3], "async")) || (argc == 5 && !strcasecmp(argv[4], "async"))) {
+        argc--;
+        async++;
+    }
+
+    if (argc == 3) {
+        if (conference_play_file(conference, argv[2], 0, NULL, async) == SWITCH_STATUS_SUCCESS) {
+            stream->write_function(stream, "(play) Playing file %s\n", argv[2]);
+            if (test_eflag(conference, EFLAG_PLAY_FILE) &&
+                switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                conference_add_event_data(conference, event);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file");
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]);
+                switch_event_fire(&event);
+            }
+        } else {
+            stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)");
+        }
+        ret_status = SWITCH_STATUS_SUCCESS;
+    } else if (argc == 4) {
+        uint32_t id = atoi(argv[3]);
+        conference_member_t *member;
+
+        if ((member = conference_member_get(conference, id))) {
+            if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) {
+                stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id);
+                if (test_eflag(conference, EFLAG_PLAY_FILE_MEMBER) &&
+                    switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                    conference_add_event_member_data(member, event);
+                    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member");
+                    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]);
+                    switch_event_fire(&event);
+                }
+            } else {
+                stream->write_function(stream, "(play) File: %s not found.\n", argv[2] ? argv[2] : "(unspecified)");
+            }
+            ret_status = SWITCH_STATUS_SUCCESS;
+        } else {
+            stream->write_function(stream, "Member: %u not found.\n", id);
+        }
+    }
+
+    return ret_status;
 }
 
 static switch_status_t conf_api_sub_say(conference_obj_t *conference, switch_stream_handle_t *stream, const char *text)
 {
-       switch_event_t *event;
-
-       if (switch_strlen_zero(text)) {
-               stream->write_function(stream, "(say) Error! No text.\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       if (conference_say(conference, text, 0) != SWITCH_STATUS_SUCCESS) {
-               stream->write_function(stream, "(say) Error!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       stream->write_function(stream, "(say) OK\n");
-       if (test_eflag(conference, EFLAG_SPEAK_TEXT) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_data(conference, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "speak-text");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Text", text);
-               switch_event_fire(&event);
-       }
-       return SWITCH_STATUS_SUCCESS;
+    switch_event_t *event;
+
+    if (switch_strlen_zero(text)) {
+        stream->write_function(stream, "(say) Error! No text.\n");
+        return SWITCH_STATUS_GENERR;
+    }
+
+    if (conference_say(conference, text, 0) != SWITCH_STATUS_SUCCESS) {
+        stream->write_function(stream, "(say) Error!\n");
+        return SWITCH_STATUS_GENERR;
+    }
+
+    stream->write_function(stream, "(say) OK\n");
+    if (test_eflag(conference, EFLAG_SPEAK_TEXT) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_data(conference, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "speak-text");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Text", text);
+        switch_event_fire(&event);
+    }
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_saymember(conference_obj_t *conference, switch_stream_handle_t *stream, const char *text)
 {
-       int ret_status = SWITCH_STATUS_GENERR;
-       char *expanded = NULL;
-       char *start_text = NULL;
-       char *workspace = NULL;
-       uint32_t id = 0;
-       conference_member_t *member;
-       switch_event_t *event;
-
-       if (switch_strlen_zero(text)) {
-               stream->write_function(stream, "(saymember) No Text!\n");
-               goto done;
-       }
-
-       if (!(workspace = strdup(text))) {
-               stream->write_function(stream, "(saymember) Memory Error!\n");
-               goto done;
-       }
-
-       if ((start_text = strchr(workspace, ' '))) {
-               *start_text++ = '\0';
-               text = start_text;
-       }
-
-       id = atoi(workspace);
-
-       if (!id || switch_strlen_zero(text)) {
-               stream->write_function(stream, "(saymember) No Text!\n");
-               goto done;
-       }
-
-       if (!(member = conference_member_get(conference, id))) {
-               stream->write_function(stream, "(saymember) Unknown Member %u!\n", id);
-               goto done;
-       }
-
-       if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), (char *) text)) != text) {
-               text = expanded;
-       } else {
-               expanded = NULL;
-       }
-
-       if (!text || conference_member_say(member, (char *) text, 0) != SWITCH_STATUS_SUCCESS) {
-               stream->write_function(stream, "(saymember) Error!\n");
-               goto done;
-       }
-
-       stream->write_function(stream, "(saymember) OK\n");
-       if (test_eflag(member->conference, EFLAG_SPEAK_TEXT_MEMBER) &&
-               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_member_data(member, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Text", text);
-               switch_event_fire(&event);
-       }
-       ret_status = SWITCH_STATUS_SUCCESS;
-
 done:
-       switch_safe_free(workspace);
-       switch_safe_free(expanded);
-       return ret_status;
+    int ret_status = SWITCH_STATUS_GENERR;
+    char *expanded = NULL;
+    char *start_text = NULL;
+    char *workspace = NULL;
+    uint32_t id = 0;
+    conference_member_t *member;
+    switch_event_t *event;
+
+    if (switch_strlen_zero(text)) {
+        stream->write_function(stream, "(saymember) No Text!\n");
+        goto done;
+    }
+
+    if (!(workspace = strdup(text))) {
+        stream->write_function(stream, "(saymember) Memory Error!\n");
+        goto done;
+    }
+
+    if ((start_text = strchr(workspace, ' '))) {
+        *start_text++ = '\0';
+        text = start_text;
+    }
+
+    id = atoi(workspace);
+
+    if (!id || switch_strlen_zero(text)) {
+        stream->write_function(stream, "(saymember) No Text!\n");
+        goto done;
+    }
+
+    if (!(member = conference_member_get(conference, id))) {
+        stream->write_function(stream, "(saymember) Unknown Member %u!\n", id);
+        goto done;
+    }
+
+    if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), (char *) text)) != text) {
+        text = expanded;
+    } else {
+        expanded = NULL;
+    }
+
+    if (!text || conference_member_say(member, (char *) text, 0) != SWITCH_STATUS_SUCCESS) {
+        stream->write_function(stream, "(saymember) Error!\n");
+        goto done;
+    }
+
+    stream->write_function(stream, "(saymember) OK\n");
+    if (test_eflag(member->conference, EFLAG_SPEAK_TEXT_MEMBER) &&
+        switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_member_data(member, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Text", text);
+        switch_event_fire(&event);
+    }
+    ret_status = SWITCH_STATUS_SUCCESS;
+
+ done:
+    switch_safe_free(workspace);
+    switch_safe_free(expanded);
+    return ret_status;
 }
 
 static switch_status_t conf_api_sub_stop(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       uint8_t current = 0, all = 0, async = 0;
-
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       if (argc > 2) {
-               current = strcasecmp(argv[2], "current") ? 0 : 1;
-               all = strcasecmp(argv[2], "all") ? 0 : 1;
-               async = strcasecmp(argv[2], "async") ? 0 : 1;
-       } else {
-               all = 1;
-       }
-
-       if (!(current || all || async))
-               return SWITCH_STATUS_GENERR;
-
-       if (argc == 4) {
-               uint32_t id = atoi(argv[3]);
-               conference_member_t *member;
-
-               if ((member = conference_member_get(conference, id))) {
-                       uint32_t stopped = conference_member_stop_file(member, async ? FILE_STOP_ASYNC : current ? FILE_STOP_CURRENT : FILE_STOP_ALL);
-                       stream->write_function(stream, "Stopped %u files.\n", stopped);
-               } else {
-                       stream->write_function(stream, "Member: %u not found.\n", id);
-               }
-       } else {
-               uint32_t stopped = conference_stop_file(conference, async ? FILE_STOP_ASYNC : current ? FILE_STOP_CURRENT : FILE_STOP_ALL);
-               stream->write_function(stream, "Stopped %u files.\n", stopped);
-       }
-       return SWITCH_STATUS_SUCCESS;
+    uint8_t current = 0, all = 0, async = 0;
+
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    if (argc > 2) {
+        current = strcasecmp(argv[2], "current") ? 0 : 1;
+        all = strcasecmp(argv[2], "all") ? 0 : 1;
+        async = strcasecmp(argv[2], "async") ? 0 : 1;
+    } else {
+        all = 1;
+    }
+
+    if (!(current || all || async))
+        return SWITCH_STATUS_GENERR;
+
+    if (argc == 4) {
+        uint32_t id = atoi(argv[3]);
+        conference_member_t *member;
+
+        if ((member = conference_member_get(conference, id))) {
+            uint32_t stopped = conference_member_stop_file(member, async ? FILE_STOP_ASYNC : current ? FILE_STOP_CURRENT : FILE_STOP_ALL);
+            stream->write_function(stream, "Stopped %u files.\n", stopped);
+        } else {
+            stream->write_function(stream, "Member: %u not found.\n", id);
+        }
+    } else {
+        uint32_t stopped = conference_stop_file(conference, async ? FILE_STOP_ASYNC : current ? FILE_STOP_CURRENT : FILE_STOP_ALL);
+        stream->write_function(stream, "Stopped %u files.\n", stopped);
+    }
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_relate(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       uint8_t nospeak = 0, nohear = 0, clear = 0;
-
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       if (argc <= 4)
-               return SWITCH_STATUS_GENERR;
-
-       nospeak = strstr(argv[4], "nospeak") ? 1 : 0;
-       nohear = strstr(argv[4], "nohear") ? 1 : 0;
-
-       if (!strcasecmp(argv[4], "clear")) {
-               clear = 1;
-       }
-
-       if (!(clear || nospeak || nohear)) {
-               return SWITCH_STATUS_GENERR;
-       }
-
-       if (clear) {
-               conference_member_t *member = NULL;
-               uint32_t id = atoi(argv[2]);
-               uint32_t oid = atoi(argv[3]);
-
-               if ((member = conference_member_get(conference, id))) {
-                       member_del_relationship(member, oid);
-                       stream->write_function(stream, "relationship %u->%u cleared.\n", id, oid);
-               } else {
-                       stream->write_function(stream, "relationship %u->%u not found.\n", id, oid);
-               }
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (nospeak || nohear) {
-               conference_member_t *member = NULL, *other_member = NULL;
-               uint32_t id = atoi(argv[2]);
-               uint32_t oid = atoi(argv[3]);
-
-               if ((member = conference_member_get(conference, id))
-                       && (other_member = conference_member_get(conference, oid))) {
-                       conference_relationship_t *rel = NULL;
-                       if ((rel = member_get_relationship(member, other_member))) {
-                               rel->flags = 0;
-                       } else {
-                               rel = member_add_relationship(member, oid);
-                       }
-
-                       if (rel) {
-                               switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR);
-                               if (nospeak) {
-                                       switch_clear_flag(rel, RFLAG_CAN_SPEAK);
-                               }
-                               if (nohear) {
-                                       switch_clear_flag(rel, RFLAG_CAN_HEAR);
-                               }
-                               stream->write_function(stream, "ok %u->%u set\n", id, oid);
-                       } else {
-                               stream->write_function(stream, "error!\n");
-                       }
-               } else {
-                       stream->write_function(stream, "relationship %u->%u not found.\n", id, oid);
-               }
-       }
-
-       return SWITCH_STATUS_SUCCESS;
+    uint8_t nospeak = 0, nohear = 0, clear = 0;
+
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    if (argc <= 4)
+        return SWITCH_STATUS_GENERR;
+
+    nospeak = strstr(argv[4], "nospeak") ? 1 : 0;
+    nohear = strstr(argv[4], "nohear") ? 1 : 0;
+
+    if (!strcasecmp(argv[4], "clear")) {
+        clear = 1;
+    }
+
+    if (!(clear || nospeak || nohear)) {
+        return SWITCH_STATUS_GENERR;
+    }
+
+    if (clear) {
+        conference_member_t *member = NULL;
+        uint32_t id = atoi(argv[2]);
+        uint32_t oid = atoi(argv[3]);
+
+        if ((member = conference_member_get(conference, id))) {
+            member_del_relationship(member, oid);
+            stream->write_function(stream, "relationship %u->%u cleared.\n", id, oid);
+        } else {
+            stream->write_function(stream, "relationship %u->%u not found.\n", id, oid);
+        }
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    if (nospeak || nohear) {
+        conference_member_t *member = NULL, *other_member = NULL;
+        uint32_t id = atoi(argv[2]);
+        uint32_t oid = atoi(argv[3]);
+
+        if ((member = conference_member_get(conference, id))
+            && (other_member = conference_member_get(conference, oid))) {
+            conference_relationship_t *rel = NULL;
+            if ((rel = member_get_relationship(member, other_member))) {
+                rel->flags = 0;
+            } else {
+                rel = member_add_relationship(member, oid);
+            }
+
+            if (rel) {
+                switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR);
+                if (nospeak) {
+                    switch_clear_flag(rel, RFLAG_CAN_SPEAK);
+                }
+                if (nohear) {
+                    switch_clear_flag(rel, RFLAG_CAN_HEAR);
+                }
+                stream->write_function(stream, "ok %u->%u set\n", id, oid);
+            } else {
+                stream->write_function(stream, "error!\n");
+            }
+        } else {
+            stream->write_function(stream, "relationship %u->%u not found.\n", id, oid);
+        }
+    }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_lock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_event_t *event;
+    switch_event_t *event;
 
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
 
-       if (conference->is_locked_sound) {
-               conference_play_file(conference, conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0);
-       }
+    if (conference->is_locked_sound) {
+        conference_play_file(conference, conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0);
+    }
 
-       switch_set_flag_locked(conference, CFLAG_LOCKED);
-       stream->write_function(stream, "OK %s locked\n", argv[0]);
-       if (test_eflag(conference, EFLAG_LOCK) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_data(conference, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "lock");
-               switch_event_fire(&event);
-       }
+    switch_set_flag_locked(conference, CFLAG_LOCKED);
+    stream->write_function(stream, "OK %s locked\n", argv[0]);
+    if (test_eflag(conference, EFLAG_LOCK) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_data(conference, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "lock");
+        switch_event_fire(&event);
+    }
 
-       return 0;
+    return 0;
 }
 
 static switch_status_t conf_api_sub_unlock(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_event_t *event;
+    switch_event_t *event;
 
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
 
-       if (conference->is_unlocked_sound) {
-               conference_play_file(conference, conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL, 0);
-       }
+    if (conference->is_unlocked_sound) {
+        conference_play_file(conference, conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL, 0);
+    }
 
-       switch_clear_flag_locked(conference, CFLAG_LOCKED);
-       stream->write_function(stream, "OK %s unlocked\n", argv[0]);
-       if (test_eflag(conference, EFLAG_UNLOCK) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-               conference_add_event_data(conference, event);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unlock");
-               switch_event_fire(&event);
-       }
+    switch_clear_flag_locked(conference, CFLAG_LOCKED);
+    stream->write_function(stream, "OK %s unlocked\n", argv[0]);
+    if (test_eflag(conference, EFLAG_UNLOCK) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+        conference_add_event_data(conference, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unlock");
+        switch_event_fire(&event);
+    }
 
-       return 0;
+    return 0;
 }
 
 static switch_status_t conf_api_sub_dial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_call_cause_t cause;
+    switch_call_cause_t cause;
 
-       switch_assert(stream != NULL);
+    switch_assert(stream != NULL);
 
-       if (argc <= 2) {
-               stream->write_function(stream, "Bad Args\n");
-               return SWITCH_STATUS_GENERR;
-       }
+    if (argc <= 2) {
+        stream->write_function(stream, "Bad Args\n");
+        return SWITCH_STATUS_GENERR;
+    }
 
-       if (conference) {
-               conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause);
-       } else {
-               conference_outcall(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause);
-       }
-       stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause));
+    if (conference) {
+        conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause);
+    } else {
+        conference_outcall(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause);
+    }
+    stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause));
 
-       return SWITCH_STATUS_SUCCESS;
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_bgdial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_assert(stream != NULL);
-
-       if (argc <= 2) {
-               stream->write_function(stream, "Bad Args\n");
-               return SWITCH_STATUS_GENERR;
-       }
-       if (conference) {
-               conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]);
-       } else {
-               conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]);
-       }
-       stream->write_function(stream, "OK\n");
-
-       return SWITCH_STATUS_SUCCESS;
+    switch_assert(stream != NULL);
+
+    if (argc <= 2) {
+        stream->write_function(stream, "Bad Args\n");
+        return SWITCH_STATUS_GENERR;
+    }
+    if (conference) {
+        conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]);
+    } else {
+        conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]);
+    }
+    stream->write_function(stream, "OK\n");
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_status_t ret_status = SWITCH_STATUS_SUCCESS;
-       char *conf_name = NULL, *profile_name;
-       switch_event_t *params = NULL;
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       if (argc > 3 && !switch_strlen_zero(argv[2])) {
-               int x;
-
-               conf_name = strdup(argv[2]);
-
-               if ((profile_name = strchr(conf_name, '@'))) {
-                       *profile_name++ = '\0';
-               } else {
-                       profile_name = "default";
-               }
-
-               for (x = 3; x < argc; x++) {
-                       conference_member_t *member = NULL;
-                       uint32_t id = atoi(argv[x]);
-                       conference_obj_t *new_conference = NULL;
-                       switch_channel_t *channel;
-                       switch_event_t *event;
-                       switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL;
-
-                       if (!id || !(member = conference_member_get(conference, id))) {
-                               stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name);
-                               continue;
-                       }
-
-                       channel = switch_core_session_get_channel(member->session);
-
-                       /* build a new conference if it doesn't exist */
-                       if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
-                               switch_memory_pool_t *pool = NULL;
-                               conf_xml_cfg_t xml_cfg = { 0 };
-
-                               /* Setup a memory pool to use. */
-                               if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-                                       goto done;
-                               }
-
-                               switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-                               switch_assert(params);
-                               switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name);
-                               switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name);
-                               switch_channel_event_set_data(channel, params);
-
-                               /* Open the config from the xml registry  */
-                               if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
-                                       goto done;
-                               }
-
-                               if ((profiles = switch_xml_child(cfg, "profiles"))) {
-                                       xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
-                               }
-
-                               if (!xml_cfg.profile) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name);
-                                       switch_xml_free(cxml);
-                                       cxml = NULL;
-                                       goto done;
-                               }
-
-                               xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
-
-                               /* Release the config registry handle */
-                               if (cxml) {
-                                       switch_xml_free(cxml);
-                                       cxml = NULL;
-                               }
-
-                               /* Create the conference object. */
-                               new_conference = conference_new(conf_name, xml_cfg, pool);
-
-                               if (!new_conference) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
-                                       if (pool != NULL) {
-                                               switch_core_destroy_memory_pool(&pool);
-                                       }
-                                       goto done;
-                               }
-
-                               /* Set the minimum number of members (once you go above it you cannot go below it) */
-                               new_conference->min = 1;
-
-                               /* Indicate the conference is dynamic */
-                               switch_set_flag_locked(new_conference, CFLAG_DYNAMIC);
-
-                               switch_mutex_lock(new_conference->mutex);
-
-                               /* Start the conference thread for this conference */
-                               launch_conference_thread(new_conference);
-                       } else {
-                               switch_mutex_lock(new_conference->mutex);
-                       }
-
-                       /* move the member from the old conference to the new one */
-                       switch_mutex_lock(member->flag_mutex);
-                       conference_del_member(conference, member);
-                       conference_add_member(new_conference, member);
-                       switch_mutex_unlock(new_conference->mutex);
-                       switch_mutex_unlock(member->flag_mutex);
-                       stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]);
-
-                       /* tell them what happened */
-                       if (test_eflag(conference, EFLAG_TRANSFER) &&
-                               switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                               conference_add_event_member_data(member, event);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "transfer");
-                               switch_event_fire(&event);
-                       }
-               }
-       } else {
-               ret_status = SWITCH_STATUS_GENERR;
-       }
-
 done:
-       if (params) {
-               switch_event_destroy(&params);
-       }
-       switch_safe_free(conf_name);
-       return ret_status;
+    switch_status_t ret_status = SWITCH_STATUS_SUCCESS;
+    char *conf_name = NULL, *profile_name;
+    switch_event_t *params = NULL;
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    if (argc > 3 && !switch_strlen_zero(argv[2])) {
+        int x;
+
+        conf_name = strdup(argv[2]);
+
+        if ((profile_name = strchr(conf_name, '@'))) {
+            *profile_name++ = '\0';
+        } else {
+            profile_name = "default";
+        }
+
+        for (x = 3; x < argc; x++) {
+            conference_member_t *member = NULL;
+            uint32_t id = atoi(argv[x]);
+            conference_obj_t *new_conference = NULL;
+            switch_channel_t *channel;
+            switch_event_t *event;
+            switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL;
+
+            if (!id || !(member = conference_member_get(conference, id))) {
+                stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name);
+                continue;
+            }
+
+            channel = switch_core_session_get_channel(member->session);
+
+            /* build a new conference if it doesn't exist */
+            if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
+                switch_memory_pool_t *pool = NULL;
+                conf_xml_cfg_t xml_cfg = { 0 };
+
+                /* Setup a memory pool to use. */
+                if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+                    goto done;
+                }
+
+                switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
+                switch_assert(params);
+                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name);
+                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name);
+                switch_channel_event_set_data(channel, params);
+
+                /* Open the config from the xml registry  */
+                if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
+                    goto done;
+                }
+
+                if ((profiles = switch_xml_child(cfg, "profiles"))) {
+                    xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
+                }
+
+                if (!xml_cfg.profile) {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name);
+                    switch_xml_free(cxml);
+                    cxml = NULL;
+                    goto done;
+                }
+
+                xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
+
+                /* Release the config registry handle */
+                if (cxml) {
+                    switch_xml_free(cxml);
+                    cxml = NULL;
+                }
+
+                /* Create the conference object. */
+                new_conference = conference_new(conf_name, xml_cfg, pool);
+
+                if (!new_conference) {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+                    if (pool != NULL) {
+                        switch_core_destroy_memory_pool(&pool);
+                    }
+                    goto done;
+                }
+
+                /* Set the minimum number of members (once you go above it you cannot go below it) */
+                new_conference->min = 1;
+
+                /* Indicate the conference is dynamic */
+                switch_set_flag_locked(new_conference, CFLAG_DYNAMIC);
+
+                switch_mutex_lock(new_conference->mutex);
+
+                /* Start the conference thread for this conference */
+                launch_conference_thread(new_conference);
+            } else {
+                switch_mutex_lock(new_conference->mutex);
+            }
+
+            /* move the member from the old conference to the new one */
+            switch_mutex_lock(member->flag_mutex);
+            conference_del_member(conference, member);
+            conference_add_member(new_conference, member);
+            switch_mutex_unlock(new_conference->mutex);
+            switch_mutex_unlock(member->flag_mutex);
+            stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]);
+
+            /* tell them what happened */
+            if (test_eflag(conference, EFLAG_TRANSFER) &&
+                switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+                conference_add_event_member_data(member, event);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "transfer");
+                switch_event_fire(&event);
+            }
+        }
+    } else {
+        ret_status = SWITCH_STATUS_GENERR;
+    }
+
+ done:
+    if (params) {
+        switch_event_destroy(&params);
+    }
+    switch_safe_free(conf_name);
+    return ret_status;
 }
 
 static switch_status_t conf_api_sub_record(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
 
-       if (argc <= 2)
-               return SWITCH_STATUS_GENERR;
+    if (argc <= 2)
+        return SWITCH_STATUS_GENERR;
 
-       stream->write_function(stream, "Record file %s\n", argv[2]);
-       launch_conference_record_thread(conference, argv[2]);
-       return SWITCH_STATUS_SUCCESS;
+    stream->write_function(stream, "Record file %s\n", argv[2]);
+    launch_conference_record_thread(conference, argv[2]);
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_norecord(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       int all;
+    int all;
 
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
 
-       if (argc <= 2)
-               return SWITCH_STATUS_GENERR;
+    if (argc <= 2)
+        return SWITCH_STATUS_GENERR;
 
-       all = (strcasecmp(argv[2], "all") == 0);
-       stream->write_function(stream, "Stop recording file %s\n", argv[2]);
-       if (!conference_record_stop(conference, all ? NULL : argv[2]) && !all) {
-               stream->write_function(stream, "non-existant recording '%s'\n", argv[2]);
-       }
+    all = (strcasecmp(argv[2], "all") == 0);
+    stream->write_function(stream, "Stop recording file %s\n", argv[2]);
+    if (!conference_record_stop(conference, all ? NULL : argv[2]) && !all) {
+        stream->write_function(stream, "non-existant recording '%s'\n", argv[2]);
+    }
 
-       return SWITCH_STATUS_SUCCESS;
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_api_sub_pin(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       if ((argc == 3) && (!strcmp(argv[1], "pin"))) {
-               conference->pin = switch_core_strdup(conference->pool, argv[2]);
-               stream->write_function(stream, "Pin for conference %s set: %s\n", argv[0], conference->pin);
-               return SWITCH_STATUS_SUCCESS;
-       } else if (argc == 2 && (!strcmp(argv[1], "nopin"))) {
-               conference->pin = NULL;
-               stream->write_function(stream, "Pin for conference %s deleted\n", argv[0]);
-               return SWITCH_STATUS_SUCCESS;
-       } else {
-               stream->write_function(stream, "Invalid parameters:\n");
-               return SWITCH_STATUS_GENERR;
-       }
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    if ((argc == 3) && (!strcmp(argv[1], "pin"))) {
+        conference->pin = switch_core_strdup(conference->pool, argv[2]);
+        stream->write_function(stream, "Pin for conference %s set: %s\n", argv[0], conference->pin);
+        return SWITCH_STATUS_SUCCESS;
+    } else if (argc == 2 && (!strcmp(argv[1], "nopin"))) {
+        conference->pin = NULL;
+        stream->write_function(stream, "Pin for conference %s deleted\n", argv[0]);
+        return SWITCH_STATUS_SUCCESS;
+    } else {
+        stream->write_function(stream, "Invalid parameters:\n");
+        return SWITCH_STATUS_GENERR;
+    }
 }
 
 typedef enum {
-       CONF_API_COMMAND_LIST = 0,
-       CONF_API_COMMAND_ENERGY,
-       CONF_API_COMMAND_VOLUME_IN,
-       CONF_API_COMMAND_VOLUME_OUT,
-       CONF_API_COMMAND_PLAY,
-       CONF_API_COMMAND_SAY,
-       CONF_API_COMMAND_SAYMEMBER,
-       CONF_API_COMMAND_STOP,
-       CONF_API_COMMAND_DTMF,
-       CONF_API_COMMAND_KICK,
-       CONF_API_COMMAND_MUTE,
-       CONF_API_COMMAND_UNMUTE,
-       CONF_API_COMMAND_DEAF,
-       CONF_API_COMMAND_UNDEAF,
-       CONF_API_COMMAND_RELATE,
-       CONF_API_COMMAND_LOCK,
-       CONF_API_COMMAND_UNLOCK,
-       CONF_API_COMMAND_DIAL,
-       CONF_API_COMMAND_BGDIAL,
-       CONF_API_COMMAND_TRANSFER,
-       CONF_API_COMMAND_RECORD,
-       CONF_API_COMMAND_NORECORD
+    CONF_API_COMMAND_LIST = 0,
+    CONF_API_COMMAND_ENERGY,
+    CONF_API_COMMAND_VOLUME_IN,
+    CONF_API_COMMAND_VOLUME_OUT,
+    CONF_API_COMMAND_PLAY,
+    CONF_API_COMMAND_SAY,
+    CONF_API_COMMAND_SAYMEMBER,
+    CONF_API_COMMAND_STOP,
+    CONF_API_COMMAND_DTMF,
+    CONF_API_COMMAND_KICK,
+    CONF_API_COMMAND_MUTE,
+    CONF_API_COMMAND_UNMUTE,
+    CONF_API_COMMAND_DEAF,
+    CONF_API_COMMAND_UNDEAF,
+    CONF_API_COMMAND_RELATE,
+    CONF_API_COMMAND_LOCK,
+    CONF_API_COMMAND_UNLOCK,
+    CONF_API_COMMAND_DIAL,
+    CONF_API_COMMAND_BGDIAL,
+    CONF_API_COMMAND_TRANSFER,
+    CONF_API_COMMAND_RECORD,
+    CONF_API_COMMAND_NORECORD
 } api_command_type_t;
 
 /* API Interface Function sub-commands */
 /* Entries in this list should be kept in sync with the enum above */
 static api_command_t conf_api_sub_commands[] = {
-       {"list", (void_fn_t) &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"},
-       {"energy", (void_fn_t) &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> energy <member_id|all|last> [<newval>]"},
-       {"volume_in", (void_fn_t) &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> volume_in <member_id|all|last> [<newval>]"},
-       {"volume_out", (void_fn_t) &conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> volume_out <member_id|all|last> [<newval>]"},
-       {"play", (void_fn_t) &conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [async|<member_id>]"},
-       {"say", (void_fn_t) &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"},
-       {"saymember", (void_fn_t) &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE,
-        "<confname> saymember <member_id> <text>"},
-       {"stop", (void_fn_t) &conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT,
-        "<confname> stop <[current|all|async|last]> [<member_id>]"},
-       {"dtmf", (void_fn_t) &conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> dtmf <[member_id|all|last]> <digits>"},
-       {"kick", (void_fn_t) &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"},
-       {"mute", (void_fn_t) &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"},
-       {"unmute", (void_fn_t) &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> unmute <[member_id|all]|last>"},
-       {"deaf", (void_fn_t) &conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"},
-       {"undeaf", (void_fn_t) &conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET,
-        "<confname> undeaf <[member_id|all]|last>"},
-       {"relate", (void_fn_t) &conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT,
-        "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"},
-       {"lock", (void_fn_t) &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"},
-       {"unlock", (void_fn_t) &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"},
-       {"dial", (void_fn_t) &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT,
-        "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"},
-       {"bgdial", (void_fn_t) &conf_api_sub_bgdial, CONF_API_SUB_ARGS_SPLIT,
-        "<confname> bgdial <endpoint_module_name>/<destination> <callerid number> <callerid name>"},
-       {"transfer", (void_fn_t) &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT,
-        "<confname> transfer <conference_name> <member id> [...<member id>]"},
-       {"record", (void_fn_t) &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"},
-       {"norecord", (void_fn_t) &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"},
-       {"pin", (void_fn_t) &conf_api_sub_pin, CONF_API_SUB_ARGS_SPLIT, "<confname> pin <pin#>"},
-       {"nopin", (void_fn_t) &conf_api_sub_pin, CONF_API_SUB_ARGS_SPLIT, "<confname> nopin"},
+    {"list", (void_fn_t) &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"},
+    {"energy", (void_fn_t) &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> energy <member_id|all|last> [<newval>]"},
+    {"volume_in", (void_fn_t) &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> volume_in <member_id|all|last> [<newval>]"},
+    {"volume_out", (void_fn_t) &conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> volume_out <member_id|all|last> [<newval>]"},
+    {"play", (void_fn_t) &conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [async|<member_id>]"},
+    {"say", (void_fn_t) &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"},
+    {"saymember", (void_fn_t) &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE,
+     "<confname> saymember <member_id> <text>"},
+    {"stop", (void_fn_t) &conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT,
+     "<confname> stop <[current|all|async|last]> [<member_id>]"},
+    {"dtmf", (void_fn_t) &conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> dtmf <[member_id|all|last]> <digits>"},
+    {"kick", (void_fn_t) &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"},
+    {"mute", (void_fn_t) &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"},
+    {"unmute", (void_fn_t) &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> unmute <[member_id|all]|last>"},
+    {"deaf", (void_fn_t) &conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"},
+    {"undeaf", (void_fn_t) &conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET,
+     "<confname> undeaf <[member_id|all]|last>"},
+    {"relate", (void_fn_t) &conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT,
+     "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"},
+    {"lock", (void_fn_t) &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"},
+    {"unlock", (void_fn_t) &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"},
+    {"dial", (void_fn_t) &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT,
+     "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"},
+    {"bgdial", (void_fn_t) &conf_api_sub_bgdial, CONF_API_SUB_ARGS_SPLIT,
+     "<confname> bgdial <endpoint_module_name>/<destination> <callerid number> <callerid name>"},
+    {"transfer", (void_fn_t) &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT,
+     "<confname> transfer <conference_name> <member id> [...<member id>]"},
+    {"record", (void_fn_t) &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"},
+    {"norecord", (void_fn_t) &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"},
+    {"pin", (void_fn_t) &conf_api_sub_pin, CONF_API_SUB_ARGS_SPLIT, "<confname> pin <pin#>"},
+    {"nopin", (void_fn_t) &conf_api_sub_pin, CONF_API_SUB_ARGS_SPLIT, "<confname> nopin"},
 };
 
 #define CONFFUNCAPISIZE (sizeof(conf_api_sub_commands)/sizeof(conf_api_sub_commands[0]))
 
 switch_status_t conf_api_dispatch(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv, const char *cmdline, int argn)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       uint32_t i, found = 0;
-       switch_assert(conference != NULL);
-       switch_assert(stream != NULL);
-
-       /* loop through the command table to find a match */
-       for (i = 0; i < CONFFUNCAPISIZE && !found; i++) {
-               if (strcasecmp(argv[argn], conf_api_sub_commands[i].pname) == 0) {
-                       found = 1;
-                       switch (conf_api_sub_commands[i].fntype) {
-
-                               /* commands that we've broken the command line into arguments for */
-                       case CONF_API_SUB_ARGS_SPLIT:
-                               {
-                                       conf_api_args_cmd_t pfn = (conf_api_args_cmd_t) conf_api_sub_commands[i].pfnapicmd;
-
-                                       if (pfn(conference, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
-                                               /* command returned error, so show syntax usage */
-                                               stream->write_function(stream, conf_api_sub_commands[i].psyntax);
-                                       }
-                               }
-                               break;
-
-                               /* member specific command that can be itteratted */
-                       case CONF_API_SUB_MEMBER_TARGET:
-                               {
-                                       uint32_t id = 0;
-                                       uint8_t all = 0;
-                                       uint8_t last = 0;
-
-                                       if (argv[argn + 1]) {
-                                               if (!(id = atoi(argv[argn + 1]))) {
-                                                       all = strcasecmp(argv[argn + 1], "all") ? 0 : 1;
-                                                       last = strcasecmp(argv[argn + 1], "last") ? 0 : 1;
-                                               }
-                                       }
-
-                                       if (all) {
-                                               conference_member_itterator(conference, stream, (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd, argv[argn + 2]);
-                                       } else if (last) {
-                                               conference_member_t *member = NULL;
-                                               conference_member_t *last_member = NULL;
-
-                                               switch_mutex_lock(conference->member_mutex);
-
-                                               /* find last (oldest) member */
-                                               member = conference->members;
-                                               while (member != NULL) {
-                                                       if (last_member == NULL || member->id > last_member->id) {
-                                                               last_member = member;
-                                                       }
-                                                       member = member->next;
-                                               }
-
-                                               /* exec functio on last (oldest) member */
-                                               if (last_member != NULL) {
-                                                       conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd;
-                                                       pfn(last_member, stream, argv[argn + 2]);
-                                               }
-
-                                               switch_mutex_unlock(conference->member_mutex);
-                                       } else if (id) {
-                                               conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd;
-                                               conference_member_t *member = conference_member_get(conference, id);
-
-                                               if (member != NULL) {
-                                                       pfn(member, stream, argv[argn + 2]);
-                                               } else {
-                                                       stream->write_function(stream, "Non-Existant ID %u\n", id);
-                                               }
-                                       } else {
-                                               stream->write_function(stream, conf_api_sub_commands[i].psyntax);
-                                       }
-                               }
-                               break;
-
-                               /* commands that deals with all text after command */
-                       case CONF_API_SUB_ARGS_AS_ONE:
-                               {
-                                       conf_api_text_cmd_t pfn = (conf_api_text_cmd_t) conf_api_sub_commands[i].pfnapicmd;
-                                       char *start_text;
-                                       const char *modified_cmdline = cmdline;
-                                       const char *cmd = conf_api_sub_commands[i].pname;
-
-                                       if (!switch_strlen_zero(modified_cmdline) && (start_text = strstr(modified_cmdline, cmd))) {
-                                               modified_cmdline = start_text + strlen(cmd);
-                                               while (modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) {
-                                                       modified_cmdline++;
-                                               }
-                                       }
-
-                                       /* call the command handler */
-                                       if (pfn(conference, stream, modified_cmdline) != SWITCH_STATUS_SUCCESS) {
-                                               /* command returned error, so show syntax usage */
-                                               stream->write_function(stream, conf_api_sub_commands[i].psyntax);
-                                       }
-                               }
-                               break;
-                       }
-               }
-       }
-
-       if (!found) {
-               stream->write_function(stream, "Confernece command '%s' not found.\n", argv[argn]);
-       } else {
-               status = SWITCH_STATUS_SUCCESS;
-       }
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    uint32_t i, found = 0;
+    switch_assert(conference != NULL);
+    switch_assert(stream != NULL);
+
+    /* loop through the command table to find a match */
+    for (i = 0; i < CONFFUNCAPISIZE && !found; i++) {
+        if (strcasecmp(argv[argn], conf_api_sub_commands[i].pname) == 0) {
+            found = 1;
+            switch (conf_api_sub_commands[i].fntype) {
+
+                /* commands that we've broken the command line into arguments for */
+            case CONF_API_SUB_ARGS_SPLIT:
+                {
+                    conf_api_args_cmd_t pfn = (conf_api_args_cmd_t) conf_api_sub_commands[i].pfnapicmd;
+
+                    if (pfn(conference, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
+                        /* command returned error, so show syntax usage */
+                        stream->write_function(stream, conf_api_sub_commands[i].psyntax);
+                    }
+                }
+                break;
+
+                /* member specific command that can be itteratted */
+            case CONF_API_SUB_MEMBER_TARGET:
+                {
+                    uint32_t id = 0;
+                    uint8_t all = 0;
+                    uint8_t last = 0;
+
+                    if (argv[argn + 1]) {
+                        if (!(id = atoi(argv[argn + 1]))) {
+                            all = strcasecmp(argv[argn + 1], "all") ? 0 : 1;
+                            last = strcasecmp(argv[argn + 1], "last") ? 0 : 1;
+                        }
+                    }
+
+                    if (all) {
+                        conference_member_itterator(conference, stream, (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd, argv[argn + 2]);
+                    } else if (last) {
+                        conference_member_t *member = NULL;
+                        conference_member_t *last_member = NULL;
+
+                        switch_mutex_lock(conference->member_mutex);
+
+                        /* find last (oldest) member */
+                        member = conference->members;
+                        while (member != NULL) {
+                            if (last_member == NULL || member->id > last_member->id) {
+                                last_member = member;
+                            }
+                            member = member->next;
+                        }
+
+                        /* exec functio on last (oldest) member */
+                        if (last_member != NULL) {
+                            conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd;
+                            pfn(last_member, stream, argv[argn + 2]);
+                        }
+
+                        switch_mutex_unlock(conference->member_mutex);
+                    } else if (id) {
+                        conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd;
+                        conference_member_t *member = conference_member_get(conference, id);
+
+                        if (member != NULL) {
+                            pfn(member, stream, argv[argn + 2]);
+                        } else {
+                            stream->write_function(stream, "Non-Existant ID %u\n", id);
+                        }
+                    } else {
+                        stream->write_function(stream, conf_api_sub_commands[i].psyntax);
+                    }
+                }
+                break;
+
+                /* commands that deals with all text after command */
+            case CONF_API_SUB_ARGS_AS_ONE:
+                {
+                    conf_api_text_cmd_t pfn = (conf_api_text_cmd_t) conf_api_sub_commands[i].pfnapicmd;
+                    char *start_text;
+                    const char *modified_cmdline = cmdline;
+                    const char *cmd = conf_api_sub_commands[i].pname;
+
+                    if (!switch_strlen_zero(modified_cmdline) && (start_text = strstr(modified_cmdline, cmd))) {
+                        modified_cmdline = start_text + strlen(cmd);
+                        while (modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) {
+                            modified_cmdline++;
+                        }
+                    }
+
+                    /* call the command handler */
+                    if (pfn(conference, stream, modified_cmdline) != SWITCH_STATUS_SUCCESS) {
+                        /* command returned error, so show syntax usage */
+                        stream->write_function(stream, conf_api_sub_commands[i].psyntax);
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    if (!found) {
+        stream->write_function(stream, "Confernece command '%s' not found.\n", argv[argn]);
+    } else {
+        status = SWITCH_STATUS_SUCCESS;
+    }
+
+    return status;
 }
 
 /* API Interface Function */
 SWITCH_STANDARD_API(conf_api_main)
 {
-       char *lbuf = NULL;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       char *http = NULL;
-       int argc;
-       char *argv[25] = { 0 };
-
-       if (!cmd) {
-               cmd = "help";
-       }
-
-       if (session) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (stream->param_event) {
-               http = switch_event_get_header(stream->param_event, "http-host");
-       }
-
-       if (http) {
-               /* Output must be to a web browser */
-               stream->write_function(stream, "<pre>\n");
-       }
-
-       if (!(lbuf = strdup(cmd))) {
-               return status;
-       }
-
-       argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-
-       /* try to find a command to execute */
-       if (argc && argv[0]) {
-               conference_obj_t *conference = NULL;
-
-               if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) {
-                       if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
-                               goto done;
-                       }
-                       if (argc >= 2) {
-                               conf_api_dispatch(conference, stream, argc, argv, cmd, 1);
-                       } else {
-                               stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n");
-                       }
-                       switch_thread_rwlock_unlock(conference->rwlock);
-
-               } else if (argv[0]) {
-                       /* special case the list command, because it doesn't require a conference argument */
-                       if (strcasecmp(argv[0], "list") == 0) {
-                               conf_api_sub_list(NULL, stream, argc, argv);
-                       } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) {
-                               stream->write_function(stream, "%s\n", api_syntax);
-                       } else if (argv[1] && strcasecmp(argv[1], "dial") == 0) {
-                               if (conf_api_sub_dial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
-                                       /* command returned error, so show syntax usage */
-                                       stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_DIAL].psyntax);
-                               }
-                       } else if (strcasecmp(argv[0], "bgdial") == 0) {
-                               if (conf_api_sub_bgdial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
-                                       /* command returned error, so show syntax usage */
-                                       stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_BGDIAL].psyntax);
-                               }
-                       } else {
-                               stream->write_function(stream, "Conference %s not found\n", argv[0]);
-                       }
-               }
-
-       } else {
-               stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n");
-       }
-
 done:
-       switch_safe_free(lbuf);
-
-       return status;
+    char *lbuf = NULL;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    char *http = NULL;
+    int argc;
+    char *argv[25] = { 0 };
+
+    if (!cmd) {
+        cmd = "help";
+    }
+
+    if (session) {
+        return SWITCH_STATUS_FALSE;
+    }
+
+    if (stream->param_event) {
+        http = switch_event_get_header(stream->param_event, "http-host");
+    }
+
+    if (http) {
+        /* Output must be to a web browser */
+        stream->write_function(stream, "<pre>\n");
+    }
+
+    if (!(lbuf = strdup(cmd))) {
+        return status;
+    }
+
+    argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+
+    /* try to find a command to execute */
+    if (argc && argv[0]) {
+        conference_obj_t *conference = NULL;
+
+        if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) {
+            if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+                goto done;
+            }
+            if (argc >= 2) {
+                conf_api_dispatch(conference, stream, argc, argv, cmd, 1);
+            } else {
+                stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n");
+            }
+            switch_thread_rwlock_unlock(conference->rwlock);
+
+        } else if (argv[0]) {
+            /* special case the list command, because it doesn't require a conference argument */
+            if (strcasecmp(argv[0], "list") == 0) {
+                conf_api_sub_list(NULL, stream, argc, argv);
+            } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) {
+                stream->write_function(stream, "%s\n", api_syntax);
+            } else if (argv[1] && strcasecmp(argv[1], "dial") == 0) {
+                if (conf_api_sub_dial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
+                    /* command returned error, so show syntax usage */
+                    stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_DIAL].psyntax);
+                }
+            } else if (strcasecmp(argv[0], "bgdial") == 0) {
+                if (conf_api_sub_bgdial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) {
+                    /* command returned error, so show syntax usage */
+                    stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_BGDIAL].psyntax);
+                }
+            } else {
+                stream->write_function(stream, "Conference %s not found\n", argv[0]);
+            }
+        }
+
+    } else {
+        stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n");
+    }
+
+ done:
+    switch_safe_free(lbuf);
+
+    return status;
 
 }
 
 /* generate an outbound call from the conference */
 static switch_status_t conference_outcall(conference_obj_t *conference,
-                                                                                 char *conference_name,
-                                                                                 switch_core_session_t *session,
-                                                                                 char *bridgeto, uint32_t timeout, char *flags, char *cid_name, char *cid_num, switch_call_cause_t *cause)
+                                          char *conference_name,
+                                          switch_core_session_t *session,
+                                          char *bridgeto, uint32_t timeout, char *flags, char *cid_name, char *cid_num, switch_call_cause_t *cause)
 {
-       switch_core_session_t *peer_session = NULL;
-       switch_channel_t *peer_channel;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       switch_channel_t *caller_channel = NULL;
-       char appdata[512];
-       int rdlock = 0;
-
-       *cause = SWITCH_CAUSE_NORMAL_CLEARING;
-
-       if (conference == NULL) {
-               char *dialstr = switch_mprintf("{ignore_early_media=true}%s", bridgeto);
-               status = switch_ivr_originate(NULL, &peer_session, cause, dialstr, 60, NULL, cid_name, cid_num, NULL, SOF_NONE);
-               switch_safe_free(dialstr);
-
-               if (status != SWITCH_STATUS_SUCCESS) {
-                       return status;
-               }
-
-               peer_channel = switch_core_session_get_channel(peer_session);
-               rdlock = 1;
-               goto callup;
-       }
-
-       conference_name = conference->name;
-
-       if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (session != NULL) {
-               caller_channel = switch_core_session_get_channel(session);
-       }
-
-       if (switch_strlen_zero(cid_name)) {
-               cid_name = conference->caller_id_name;
-       }
-
-       if (switch_strlen_zero(cid_num)) {
-               cid_num = conference->caller_id_number;
-       }
-
-       /* establish an outbound call leg */
-
-       if (switch_ivr_originate(session, &peer_session, cause, bridgeto, timeout, NULL, cid_name, cid_num, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", switch_channel_cause2str(*cause));
-               if (caller_channel) {
-                       switch_channel_hangup(caller_channel, *cause);
-               }
-               goto done;
-       }
-
-       rdlock = 1;
-       peer_channel = switch_core_session_get_channel(peer_session);
-       switch_channel_set_state(peer_channel, CS_SOFT_EXECUTE);
-
-       /* make sure the conference still exists */
-       if (!switch_test_flag(conference, CFLAG_RUNNING)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n");
-               if (caller_channel) {
-                       switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
-               }
-               switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
-               goto done;
-       }
-
-       if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
-               switch_channel_answer(caller_channel);
-       }
-
 callup:
-
-       /* if the outbound call leg is ready */
-       if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) {
-               switch_caller_extension_t *extension = NULL;
-
-               /* build an extension name object */
-               if ((extension = switch_caller_extension_new(peer_session, conference_name, conference_name)) == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
-                       status = SWITCH_STATUS_MEMERR;
-                       goto done;
-               }
-               /* add them to the conference */
-               if (flags && !strcasecmp(flags, "none")) {
-                       switch_snprintf(appdata, sizeof(appdata), "%s+flags{%s}", conference_name, flags);
-                       switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata);
-               } else {
-                       switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference_name);
-               }
-
-               switch_channel_set_caller_extension(peer_channel, extension);
-               switch_channel_set_state(peer_channel, CS_EXECUTE);
-
-       } else {
-               switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER);
-               status = SWITCH_STATUS_FALSE;
-               goto done;
-       }
-
 done:
-       if (conference) {
-               switch_thread_rwlock_unlock(conference->rwlock);
-       }
-       if (rdlock && peer_session) {
-               switch_core_session_rwunlock(peer_session);
-       }
-
-       return status;
+    switch_core_session_t *peer_session = NULL;
+    switch_channel_t *peer_channel;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    switch_channel_t *caller_channel = NULL;
+    char appdata[512];
+    int rdlock = 0;
+
+    *cause = SWITCH_CAUSE_NORMAL_CLEARING;
+
+    if (conference == NULL) {
+        char *dialstr = switch_mprintf("{ignore_early_media=true}%s", bridgeto);
+        status = switch_ivr_originate(NULL, &peer_session, cause, dialstr, 60, NULL, cid_name, cid_num, NULL, SOF_NONE);
+        switch_safe_free(dialstr);
+
+        if (status != SWITCH_STATUS_SUCCESS) {
+            return status;
+        }
+
+        peer_channel = switch_core_session_get_channel(peer_session);
+        rdlock = 1;
+        goto callup;
+    }
+
+    conference_name = conference->name;
+
+    if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+        return SWITCH_STATUS_FALSE;
+    }
+
+    if (session != NULL) {
+        caller_channel = switch_core_session_get_channel(session);
+    }
+
+    if (switch_strlen_zero(cid_name)) {
+        cid_name = conference->caller_id_name;
+    }
+
+    if (switch_strlen_zero(cid_num)) {
+        cid_num = conference->caller_id_number;
+    }
+
+    /* establish an outbound call leg */
+
+    if (switch_ivr_originate(session, &peer_session, cause, bridgeto, timeout, NULL, cid_name, cid_num, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", switch_channel_cause2str(*cause));
+        if (caller_channel) {
+            switch_channel_hangup(caller_channel, *cause);
+        }
+        goto done;
+    }
+
+    rdlock = 1;
+    peer_channel = switch_core_session_get_channel(peer_session);
+    switch_channel_set_state(peer_channel, CS_SOFT_EXECUTE);
+
+    /* make sure the conference still exists */
+    if (!switch_test_flag(conference, CFLAG_RUNNING)) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n");
+        if (caller_channel) {
+            switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
+        }
+        switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
+        goto done;
+    }
+
+    if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
+        switch_channel_answer(caller_channel);
+    }
+
+ callup:
+
+    /* if the outbound call leg is ready */
+    if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) {
+        switch_caller_extension_t *extension = NULL;
+
+        /* build an extension name object */
+        if ((extension = switch_caller_extension_new(peer_session, conference_name, conference_name)) == 0) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+            status = SWITCH_STATUS_MEMERR;
+            goto done;
+        }
+        /* add them to the conference */
+        if (flags && !strcasecmp(flags, "none")) {
+            switch_snprintf(appdata, sizeof(appdata), "%s+flags{%s}", conference_name, flags);
+            switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata);
+        } else {
+            switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference_name);
+        }
+
+        switch_channel_set_caller_extension(peer_channel, extension);
+        switch_channel_set_state(peer_channel, CS_EXECUTE);
+
+    } else {
+        switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER);
+        status = SWITCH_STATUS_FALSE;
+        goto done;
+    }
+
+ done:
+    if (conference) {
+        switch_thread_rwlock_unlock(conference->rwlock);
+    }
+    if (rdlock && peer_session) {
+        switch_core_session_rwunlock(peer_session);
+    }
+
+    return status;
 }
 
 struct bg_call {
-       conference_obj_t *conference;
-       switch_core_session_t *session;
-       char *bridgeto;
-       uint32_t timeout;
-       char *flags;
-       char *cid_name;
-       char *cid_num;
-       char *conference_name;
+    conference_obj_t *conference;
+    switch_core_session_t *session;
+    char *bridgeto;
+    uint32_t timeout;
+    char *flags;
+    char *cid_name;
+    char *cid_num;
+    char *conference_name;
 };
 
 static void *SWITCH_THREAD_FUNC conference_outcall_run(switch_thread_t *thread, void *obj)
 {
-       struct bg_call *call = (struct bg_call *) obj;
-
-       if (call) {
-               switch_call_cause_t cause;
-               switch_event_t *event;
-
-               conference_outcall(call->conference, call->conference_name,
-                                                  call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause);
-
-               if (test_eflag(call->conference, EFLAG_BGDIAL_RESULT) &&
-                       switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
-                       conference_add_event_data(call->conference, event);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Result", switch_channel_cause2str(cause));
-                       switch_event_fire(&event);
-               }
-               switch_safe_free(call->bridgeto);
-               switch_safe_free(call->flags);
-               switch_safe_free(call->cid_name);
-               switch_safe_free(call->cid_num);
-               switch_safe_free(call->conference_name);
-               switch_safe_free(call);
-       }
-
-       return NULL;
+    struct bg_call *call = (struct bg_call *) obj;
+
+    if (call) {
+        switch_call_cause_t cause;
+        switch_event_t *event;
+
+        conference_outcall(call->conference, call->conference_name,
+                           call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause);
+
+        if (test_eflag(call->conference, EFLAG_BGDIAL_RESULT) &&
+            switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+            conference_add_event_data(call->conference, event);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Result", switch_channel_cause2str(cause));
+            switch_event_fire(&event);
+        }
+        switch_safe_free(call->bridgeto);
+        switch_safe_free(call->flags);
+        switch_safe_free(call->cid_name);
+        switch_safe_free(call->cid_num);
+        switch_safe_free(call->conference_name);
+        switch_safe_free(call);
+    }
+
+    return NULL;
 }
 
 static switch_status_t conference_outcall_bg(conference_obj_t *conference,
-                                                                                        char *conference_name,
-                                                                                        switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
-                                                                                        const char *cid_num)
+                                             char *conference_name,
+                                             switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
+                                             const char *cid_num)
 {
-       struct bg_call *call = NULL;
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
-
-       if (!(call = malloc(sizeof(*call))))
-               return SWITCH_STATUS_MEMERR;
-
-       memset(call, 0, sizeof(*call));
-       call->conference = conference;
-       call->session = session;
-       call->timeout = timeout;
-
-       if (bridgeto) {
-               call->bridgeto = strdup(bridgeto);
-       }
-       if (flags) {
-               call->flags = strdup(flags);
-       }
-       if (cid_name) {
-               call->cid_name = strdup(cid_name);
-       }
-       if (cid_num) {
-               call->cid_num = strdup(cid_num);
-       }
-
-       if (conference_name) {
-               call->conference_name = strdup(conference_name);
-       }
-
-       switch_threadattr_create(&thd_attr, conference->pool);
-       switch_threadattr_detach_set(thd_attr, 1);
-       switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-       switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n");
-
-       return SWITCH_STATUS_SUCCESS;
+    struct bg_call *call = NULL;
+    switch_thread_t *thread;
+    switch_threadattr_t *thd_attr = NULL;
+
+    if (!(call = malloc(sizeof(*call))))
+        return SWITCH_STATUS_MEMERR;
+
+    memset(call, 0, sizeof(*call));
+    call->conference = conference;
+    call->session = session;
+    call->timeout = timeout;
+
+    if (bridgeto) {
+        call->bridgeto = strdup(bridgeto);
+    }
+    if (flags) {
+        call->flags = strdup(flags);
+    }
+    if (cid_name) {
+        call->cid_name = strdup(cid_name);
+    }
+    if (cid_num) {
+        call->cid_num = strdup(cid_num);
+    }
+
+    if (conference_name) {
+        call->conference_name = strdup(conference_name);
+    }
+
+    switch_threadattr_create(&thd_attr, conference->pool);
+    switch_threadattr_detach_set(thd_attr, 1);
+    switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+    switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool);
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n");
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 /* Play a file */
 static switch_status_t conference_local_play_file(conference_obj_t *conference, switch_core_session_t *session, char *path, uint32_t leadin, void *buf, uint32_t buflen)
 {
-       uint32_t x = 0;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       switch_channel_t *channel;
-       char *expanded = NULL;
-       switch_input_args_t args = { 0 }, *ap = NULL;
-
-       if (buf) {
-               args.buf = buf;
-               args.buflen = buflen;
-               ap = &args;
-       }
-
-       /* generate some space infront of the file to be played */
-       for (x = 0; x < leadin; x++) {
-               switch_frame_t *read_frame;
-               status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-
-               if (!SWITCH_READ_ACCEPTABLE(status)) {
-                       break;
-               }
-       }
-
-       /* if all is well, really play the file */
-       if (status == SWITCH_STATUS_SUCCESS) {
-               char *dpath = NULL;
-
-               channel = switch_core_session_get_channel(session);
-               if ((expanded = switch_channel_expand_variables(channel, path)) != path) {
-                       path = expanded;
-               } else {
-                       expanded = NULL;
-               }
-
-               if (!strncasecmp(path, "say:", 4)) {
-                       if (!(conference->tts_engine && conference->tts_voice)) {
-                               status = SWITCH_STATUS_FALSE;
-                       } else {
-                               status = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, path + 4, ap);
-                       }
-                       goto done;
-               }
-
-               if (conference->sound_prefix) {
-                       if (!(dpath = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, path))) {
-                               status = SWITCH_STATUS_MEMERR;
-                               goto done;
-                       }
-                       path = dpath;
-               }
-
-               status = switch_ivr_play_file(session, NULL, path, ap);
-               switch_safe_free(dpath);
-       }
-
 done:
-       switch_safe_free(expanded);
-
-       return status;
+    uint32_t x = 0;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    switch_channel_t *channel;
+    char *expanded = NULL;
+    switch_input_args_t args = { 0 }, *ap = NULL;
+
+    if (buf) {
+        args.buf = buf;
+        args.buflen = buflen;
+        ap = &args;
+    }
+
+    /* generate some space infront of the file to be played */
+    for (x = 0; x < leadin; x++) {
+        switch_frame_t *read_frame;
+        status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+
+        if (!SWITCH_READ_ACCEPTABLE(status)) {
+            break;
+        }
+    }
+
+    /* if all is well, really play the file */
+    if (status == SWITCH_STATUS_SUCCESS) {
+        char *dpath = NULL;
+
+        channel = switch_core_session_get_channel(session);
+        if ((expanded = switch_channel_expand_variables(channel, path)) != path) {
+            path = expanded;
+        } else {
+            expanded = NULL;
+        }
+
+        if (!strncasecmp(path, "say:", 4)) {
+            if (!(conference->tts_engine && conference->tts_voice)) {
+                status = SWITCH_STATUS_FALSE;
+            } else {
+                status = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, path + 4, ap);
+            }
+            goto done;
+        }
+
+        if (conference->sound_prefix) {
+            if (!(dpath = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, path))) {
+                status = SWITCH_STATUS_MEMERR;
+                goto done;
+            }
+            path = dpath;
+        }
+
+        status = switch_ivr_play_file(session, NULL, path, ap);
+        switch_safe_free(dpath);
+    }
+
+ done:
+    switch_safe_free(expanded);
+
+    return status;
 }
 
 static void set_mflags(char *flags, member_flag_t *f)
 {
-       if (flags) {
-               if (strstr(flags, "mute")) {
-                       *f &= ~MFLAG_CAN_SPEAK;
-               } else if (strstr(flags, "deaf")) {
-                       *f &= ~MFLAG_CAN_HEAR;
-               } else if (strstr(flags, "waste")) {
-                       *f |= MFLAG_WASTE_BANDWIDTH;
-               } else if (strstr(flags, "endconf")) {
-                       *f |= MFLAG_ENDCONF;
-               }
-       }
+    if (flags) {
+        if (strstr(flags, "mute")) {
+            *f &= ~MFLAG_CAN_SPEAK;
+        } else if (strstr(flags, "deaf")) {
+            *f &= ~MFLAG_CAN_HEAR;
+        } else if (strstr(flags, "waste")) {
+            *f |= MFLAG_WASTE_BANDWIDTH;
+        } else if (strstr(flags, "endconf")) {
+            *f |= MFLAG_ENDCONF;
+        }
+    }
 
 }
 
 static void clear_eflags(char *events, uint32_t *f)
 {
-       char buf[512] = "";
-       char *next = NULL;
-       char *event = buf;
-
-       if (events) {
-               switch_copy_string(buf, events, sizeof(buf));
-
-               while (event) {
-                       next = strchr(event, ',');
-                       if (next) {
-                               *next++ = '\0';
-                       }
-
-                       if (!strcmp(event, "add-member")) {
-                               *f &= ~EFLAG_ADD_MEMBER;
-                       } else if (!strcmp(event, "del-member")) {
-                               *f &= ~EFLAG_DEL_MEMBER;
-                       } else if (!strcmp(event, "energy-level")) {
-                               *f &= ~EFLAG_ENERGY_LEVEL;
-                       } else if (!strcmp(event, "volume-level")) {
-                               *f &= ~EFLAG_VOLUME_LEVEL;
-                       } else if (!strcmp(event, "gain-level")) {
-                               *f &= ~EFLAG_GAIN_LEVEL;
-                       } else if (!strcmp(event, "dtmf")) {
-                               *f &= ~EFLAG_DTMF;
-                       } else if (!strcmp(event, "stop-talking")) {
-                               *f &= ~EFLAG_STOP_TALKING;
-                       } else if (!strcmp(event, "start-talking")) {
-                               *f &= ~EFLAG_START_TALKING;
-                       } else if (!strcmp(event, "mute-member")) {
-                               *f &= ~EFLAG_MUTE_MEMBER;
-                       } else if (!strcmp(event, "unmute-member")) {
-                               *f &= ~EFLAG_UNMUTE_MEMBER;
-                       } else if (!strcmp(event, "kick-member")) {
-                               *f &= ~EFLAG_KICK_MEMBER;
-                       } else if (!strcmp(event, "dtmf-member")) {
-                               *f &= ~EFLAG_DTMF_MEMBER;
-                       } else if (!strcmp(event, "energy-level-member")) {
-                               *f &= ~EFLAG_ENERGY_LEVEL_MEMBER;
-                       } else if (!strcmp(event, "volume-in-member")) {
-                               *f &= ~EFLAG_VOLUME_IN_MEMBER;
-                       } else if (!strcmp(event, "volume-out-member")) {
-                               *f &= ~EFLAG_VOLUME_OUT_MEMBER;
-                       } else if (!strcmp(event, "play-file")) {
-                               *f &= ~EFLAG_PLAY_FILE;
-                       } else if (!strcmp(event, "play-file-member")) {
-                               *f &= ~EFLAG_PLAY_FILE_MEMBER;
-                       } else if (!strcmp(event, "speak-text")) {
-                               *f &= ~EFLAG_SPEAK_TEXT;
-                       } else if (!strcmp(event, "speak-text-member")) {
-                               *f &= ~EFLAG_SPEAK_TEXT_MEMBER;
-                       } else if (!strcmp(event, "lock")) {
-                               *f &= ~EFLAG_LOCK;
-                       } else if (!strcmp(event, "unlock")) {
-                               *f &= ~EFLAG_UNLOCK;
-                       } else if (!strcmp(event, "transfer")) {
-                               *f &= ~EFLAG_TRANSFER;
-                       } else if (!strcmp(event, "bgdial-result")) {
-                               *f &= ~EFLAG_BGDIAL_RESULT;
-                       } else if (!strcmp(event, "floor-change")) {
-                               *f &= ~EFLAG_FLOOR_CHANGE;
-                       }
-
-                       event = next;
-               }
-       }
+    char buf[512] = "";
+    char *next = NULL;
+    char *event = buf;
+
+    if (events) {
+        switch_copy_string(buf, events, sizeof(buf));
+
+        while (event) {
+            next = strchr(event, ',');
+            if (next) {
+                *next++ = '\0';
+            }
+
+            if (!strcmp(event, "add-member")) {
+                *f &= ~EFLAG_ADD_MEMBER;
+            } else if (!strcmp(event, "del-member")) {
+                *f &= ~EFLAG_DEL_MEMBER;
+            } else if (!strcmp(event, "energy-level")) {
+                *f &= ~EFLAG_ENERGY_LEVEL;
+            } else if (!strcmp(event, "volume-level")) {
+                *f &= ~EFLAG_VOLUME_LEVEL;
+            } else if (!strcmp(event, "gain-level")) {
+                *f &= ~EFLAG_GAIN_LEVEL;
+            } else if (!strcmp(event, "dtmf")) {
+                *f &= ~EFLAG_DTMF;
+            } else if (!strcmp(event, "stop-talking")) {
+                *f &= ~EFLAG_STOP_TALKING;
+            } else if (!strcmp(event, "start-talking")) {
+                *f &= ~EFLAG_START_TALKING;
+            } else if (!strcmp(event, "mute-member")) {
+                *f &= ~EFLAG_MUTE_MEMBER;
+            } else if (!strcmp(event, "unmute-member")) {
+                *f &= ~EFLAG_UNMUTE_MEMBER;
+            } else if (!strcmp(event, "kick-member")) {
+                *f &= ~EFLAG_KICK_MEMBER;
+            } else if (!strcmp(event, "dtmf-member")) {
+                *f &= ~EFLAG_DTMF_MEMBER;
+            } else if (!strcmp(event, "energy-level-member")) {
+                *f &= ~EFLAG_ENERGY_LEVEL_MEMBER;
+            } else if (!strcmp(event, "volume-in-member")) {
+                *f &= ~EFLAG_VOLUME_IN_MEMBER;
+            } else if (!strcmp(event, "volume-out-member")) {
+                *f &= ~EFLAG_VOLUME_OUT_MEMBER;
+            } else if (!strcmp(event, "play-file")) {
+                *f &= ~EFLAG_PLAY_FILE;
+            } else if (!strcmp(event, "play-file-member")) {
+                *f &= ~EFLAG_PLAY_FILE_MEMBER;
+            } else if (!strcmp(event, "speak-text")) {
+                *f &= ~EFLAG_SPEAK_TEXT;
+            } else if (!strcmp(event, "speak-text-member")) {
+                *f &= ~EFLAG_SPEAK_TEXT_MEMBER;
+            } else if (!strcmp(event, "lock")) {
+                *f &= ~EFLAG_LOCK;
+            } else if (!strcmp(event, "unlock")) {
+                *f &= ~EFLAG_UNLOCK;
+            } else if (!strcmp(event, "transfer")) {
+                *f &= ~EFLAG_TRANSFER;
+            } else if (!strcmp(event, "bgdial-result")) {
+                *f &= ~EFLAG_BGDIAL_RESULT;
+            } else if (!strcmp(event, "floor-change")) {
+                *f &= ~EFLAG_FLOOR_CHANGE;
+            }
+
+            event = next;
+        }
+    }
 }
 
 SWITCH_STANDARD_APP(conference_auto_function)
 {
-       switch_channel_t *channel = switch_core_session_get_channel(session);
-       call_list_t *call_list, *np;
-
-       call_list = switch_channel_get_private(channel, "_conference_autocall_list_");
-
-       if (switch_strlen_zero(data)) {
-               call_list = NULL;
-       } else {
-               np = switch_core_session_alloc(session, sizeof(*np));
-               switch_assert(np != NULL);
-
-               np->string = switch_core_session_strdup(session, data);
-               if (call_list) {
-                       np->next = call_list;
-                       np->itteration = call_list->itteration + 1;
-               } else {
-                       np->itteration = 1;
-               }
-               call_list = np;
-       }
-       switch_channel_set_private(channel, "_conference_autocall_list_", call_list);
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+    call_list_t *call_list, *np;
+
+    call_list = switch_channel_get_private(channel, "_conference_autocall_list_");
+
+    if (switch_strlen_zero(data)) {
+        call_list = NULL;
+    } else {
+        np = switch_core_session_alloc(session, sizeof(*np));
+        switch_assert(np != NULL);
+
+        np->string = switch_core_session_strdup(session, data);
+        if (call_list) {
+            np->next = call_list;
+            np->itteration = call_list->itteration + 1;
+        } else {
+            np->itteration = 1;
+        }
+        call_list = np;
+    }
+    switch_channel_set_private(channel, "_conference_autocall_list_", call_list);
 }
 
 /* Application interface function that is called from the dialplan to join the channel to a conference */
 SWITCH_STANDARD_APP(conference_function)
 {
-       switch_codec_t *read_codec = NULL;
-       uint32_t flags = 0;
-       conference_member_t member = { 0 };
-       conference_obj_t *conference = NULL;
-       switch_channel_t *channel = switch_core_session_get_channel(session);
-       char *mydata = NULL;
-       char *conf_name = NULL;
-       char *bridge_prefix = "bridge:";
-       char *flags_prefix = "+flags{";
-       char *bridgeto = NULL;
-       char *profile_name = NULL;
-       switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL;
-       char *flags_str;
-       member_flag_t mflags = 0;
-       switch_core_session_message_t msg = { 0 };
-       uint8_t rl = 0, isbr = 0;
-       char *dpin = NULL;
-       conf_xml_cfg_t xml_cfg = { 0 };
-       switch_event_t *params = NULL;
-
-       /* Save the original read codec. */
-       if (!(read_codec = switch_core_session_get_read_codec(session))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel has no media!\n");
-               return;
-       }
-
-
-       if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid arguments\n");
-               return;
-       }
-
-       mydata = switch_core_session_strdup(session, data);
-
-       if (!mydata) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-               return;
-       }
-
-       if ((flags_str = strstr(mydata, flags_prefix))) {
-               char *p;
-
-               *flags_str = '\0';
-               flags_str += strlen(flags_prefix);
-               if ((p = strchr(flags_str, '}'))) {
-                       *p = '\0';
-               }
-       }
-
-       /* is this a bridging conference ? */
-       if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) {
-               isbr = 1;
-               mydata += strlen(bridge_prefix);
-               if ((bridgeto = strchr(mydata, ':'))) {
-                       *bridgeto++ = '\0';
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n");
-                       goto done;
-               }
-       }
-
-       conf_name = mydata;
-
-       /* is there a conference pin ? */
-       if ((dpin = strchr(conf_name, '+'))) {
-               *dpin++ = '\0';
-       }
-
-       /* is there profile specification ? */
-       if ((profile_name = strchr(conf_name, '@'))) {
-               *profile_name++ = '\0';
-       } else {
-               profile_name = "default";
-       }
+    switch_codec_t *read_codec = NULL;
+    uint32_t flags = 0;
+    conference_member_t member = { 0 };
+    conference_obj_t *conference = NULL;
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+    char *mydata = NULL;
+    char *conf_name = NULL;
+    char *bridge_prefix = "bridge:";
+    char *flags_prefix = "+flags{";
+    char *bridgeto = NULL;
+    char *profile_name = NULL;
+    switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL;
+    char *flags_str;
+    member_flag_t mflags = 0;
+    switch_core_session_message_t msg = { 0 };
+    uint8_t rl = 0, isbr = 0;
+    char *dpin = NULL;
+    conf_xml_cfg_t xml_cfg = { 0 };
+    switch_event_t *params = NULL;
+
+    /* Save the original read codec. */
+    if (!(read_codec = switch_core_session_get_read_codec(session))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel has no media!\n");
+        return;
+    }
+
+
+    if (switch_strlen_zero(data)) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid arguments\n");
+        return;
+    }
+
+    mydata = switch_core_session_strdup(session, data);
+
+    if (!mydata) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+        return;
+    }
+
+    if ((flags_str = strstr(mydata, flags_prefix))) {
+        char *p;
+
+        *flags_str = '\0';
+        flags_str += strlen(flags_prefix);
+        if ((p = strchr(flags_str, '}'))) {
+            *p = '\0';
+        }
+    }
+
+    /* is this a bridging conference ? */
+    if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) {
+        isbr = 1;
+        mydata += strlen(bridge_prefix);
+        if ((bridgeto = strchr(mydata, ':'))) {
+            *bridgeto++ = '\0';
+        } else {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n");
+            goto done;
+        }
+    }
+
+    conf_name = mydata;
+
+    /* is there a conference pin ? */
+    if ((dpin = strchr(conf_name, '+'))) {
+        *dpin++ = '\0';
+    }
+
+    /* is there profile specification ? */
+    if ((profile_name = strchr(conf_name, '@'))) {
+        *profile_name++ = '\0';
+    } else {
+        profile_name = "default";
+    }
 
 #if 0
-       if (0) {
-               member.dtmf_parser = conference->dtmf_parser;
-       } else {
+    if (0) {
+        member.dtmf_parser = conference->dtmf_parser;
+    } else {
 
-       }
+    }
 #endif
 
-       switch_event_create(&params, SWITCH_EVENT_COMMAND);
-       switch_assert(params);
-       switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name);
-       switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name);
-
-       /* Open the config from the xml registry */
-       if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
-               goto done;
-       }
-
-       if ((profiles = switch_xml_child(cfg, "profiles"))) {
-               xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
-       }
-
-       if (!xml_cfg.profile) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name);
-               switch_xml_free(cxml);
-               cxml = NULL;
-               goto done;
-       }
-
-       xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
-
-       /* if this is a bridging call, and it's not a duplicate, build a */
-       /* conference object, and skip pin handling, and locked checking */
-       if (isbr) {
-               char *uuid = switch_core_session_get_uuid(session);
-
-               if (!strcmp(conf_name, "_uuid_")) {
-                       conf_name = uuid;
-               }
-
-               if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name);
-                       goto done;
-               }
-
-               /* Create the conference object. */
-               conference = conference_new(conf_name, xml_cfg, NULL);
-
-               if (!conference) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
-                       goto done;
-               }
-
-               switch_channel_set_variable(channel, "conference_name", conference->name);
-
-               /* Set the minimum number of members (once you go above it you cannot go below it) */
-               conference->min = 2;
-
-               /* if the dialplan specified a pin, override the profile's value */
-               if (dpin) {
-                       conference->pin = switch_core_strdup(conference->pool, dpin);
-               }
-
-               /* Indicate the conference is dynamic */
-               switch_set_flag_locked(conference, CFLAG_DYNAMIC);
-
-               /* Start the conference thread for this conference */
-               launch_conference_thread(conference);
-
-       } else {
-               /* if the conference exists, get the pointer to it */
-               if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
-                       /* couldn't find the conference, create one */
-                       conference = conference_new(conf_name, xml_cfg, NULL);
-
-                       if (!conference) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
-                               goto done;
-                       }
-
-                       /* if the dialplan specified a pin, override the profile's value */
-                       if (dpin) {
-                               conference->pin = switch_core_strdup(conference->pool, dpin);
-                       }
-               
-                       switch_channel_set_variable(channel, "conference_name", conference->name);
-
-                       /* Set the minimum number of members (once you go above it you cannot go below it) */
-                       conference->min = 1;
-
-                       /* Indicate the conference is dynamic */
-                       switch_set_flag_locked(conference, CFLAG_DYNAMIC);
-
-                       /* Start the conference thread for this conference */
-                       launch_conference_thread(conference);
-               } else { /* setup user variable */
-                       switch_channel_set_variable(channel, "conference_name", conference->name);
-               }
-
-               /* acquire a read lock on the thread so it can't leave without us */
-               if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
-                       goto done;
-               }
-               rl++;
-
-               /* if this is not an outbound call, deal with conference pins */
-               if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin && *(conference->pin)) {
-                       char pin_buf[80] = "";
-                       int pin_retries = 3;    /* XXX - this should be configurable - i'm too lazy to do it right now... */
-                       int pin_valid = 0;
-                       switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-                       /* Answer the channel */
-                       switch_channel_answer(channel);
-
-                       while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) {
-
-                               /* be friendly */
-                               if (conference->pin_sound) {
-                                       conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf));
-                               }
-                               /* wait for them if neccessary */
-                               if (strlen(pin_buf) < strlen(conference->pin)) {
-                                       char *buf = pin_buf + strlen(pin_buf);
-                                       char term = '\0';
-
-                                       status = switch_ivr_collect_digits_count(session,
-                                                                                                                        buf,
-                                                                                                                        sizeof(pin_buf) - strlen(pin_buf),
-                                                                                                                        strlen(conference->pin) - strlen(pin_buf), "#", &term, 10000, 0, 0);
-                                       if (status == SWITCH_STATUS_TIMEOUT) {
-                                               status = SWITCH_STATUS_SUCCESS;
-                                       }
-                               }
-
-                               pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0);
-                               if (!pin_valid) {
-                                       /* zero the collected pin */
-                                       memset(pin_buf, 0, sizeof(pin_buf));
-
-                                       /* more friendliness */
-                                       if (conference->bad_pin_sound) {
-                                               conference_local_play_file(conference, session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf));
-                                       }
-                               }
-                               pin_retries--;
-                       }
-
-                       if (!pin_valid) {
-                               goto done;
-                       }
-               }
-
-               if (conference->special_announce) {
-                       conference_local_play_file(conference, session, conference->special_announce, CONF_DEFAULT_LEADIN, NULL, 0);
-               }
-
-               /* don't allow more callers if the conference is locked, unless we invited them */
-               if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name);
-                       if (conference->locked_sound) {
-                               /* Answer the channel */
-                               switch_channel_answer(channel);
-                               conference_local_play_file(conference, session, conference->locked_sound, 20, NULL, 0);
-                       }
-                       goto done;
-               }
-
-               /* dont allow more callers than the max_members allows for -- I explicitly didnt allow outbound calls
-                * someone else can add that (see above) if they feel that outbound calls should be able to violate the
-                * max_members limit
-                */
-               if ((conference->max_members > 0) && (conference->count >= conference->max_members)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is full.\n", conf_name);
-                       if (conference->maxmember_sound) {
-                               /* Answer the channel */
-                               switch_channel_answer(channel);
-                               conference_local_play_file(conference, session, conference->maxmember_sound, 20, NULL, 0);
-                       }
-                       goto done;
-               }
-
-       }
-
-       /* Release the config registry handle */
-       if (cxml) {
-               switch_xml_free(cxml);
-               cxml = NULL;
-       }
-
-       /* if we're using "bridge:" make an outbound call and bridge it in */
-       if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) {
-               switch_call_cause_t cause;
-               if (conference_outcall(conference, NULL, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) {
-                       goto done;
-               }
-       } else {
-               /* if we're not using "bridge:" set the conference answered flag */
-               /* and this isn't an outbound channel, answer the call */
-               if (!switch_channel_test_flag(channel, CF_OUTBOUND))
-                       switch_set_flag(conference, CFLAG_ANSWERED);
-       }
-
-       member.orig_read_codec = read_codec;
-       member.native_rate = read_codec->implementation->samples_per_second;
-       member.pool = switch_core_session_get_pool(session);
-
-       /* Setup a Signed Linear codec for reading audio. */
-       if (switch_core_codec_init(&member.read_codec,
-                                                          "L16",
-                                                          NULL, read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000,
-                                                          1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-                                                 "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
-                                                 read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
-
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
-                                                 read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
-
-               flags = 0;
-               goto done;
-       }
-
-       member.frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
-       member.frame = switch_core_alloc(member.pool, member.frame_size);
-       member.mux_frame = switch_core_alloc(member.pool, member.frame_size);
-
-       if (read_codec->implementation->actual_samples_per_second != conference->rate) {
-               if (switch_resample_create(&member.read_resampler,
-                                                                  read_codec->implementation->actual_samples_per_second,
-                                                                  member.frame_size, conference->rate, member.frame_size, member.pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n");
-                       goto done;
-               }
-
-
-               member.resample_out = switch_core_alloc(member.pool, member.frame_size);
-               member.resample_out_len = member.frame_size;
-
-               /* Setup an audio buffer for the resampled audio */
-               if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX)
-                       != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-                       goto done;
-               }
-       }
-
-
-       /* Setup a Signed Linear codec for writing audio. */
-       if (switch_core_codec_init(&member.write_codec,
-                                                          "L16",
-                                                          NULL,
-                                                          conference->rate,
-                                                          read_codec->implementation->microseconds_per_packet / 1000,
-                                                          1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-                                                 "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
-                                                 conference->rate, read_codec->implementation->microseconds_per_packet / 1000);
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
-                                                 conference->rate, read_codec->implementation->microseconds_per_packet / 1000);
-               flags = 0;
-               goto codec_done2;
-       }
-
-       /* Setup an audio buffer for the incoming audio */
-       if (switch_buffer_create_dynamic(&member.audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-               goto codec_done1;
-       }
-
-       /* Setup an audio buffer for the outgoing audio */
-       if (switch_buffer_create_dynamic(&member.mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-               goto codec_done1;
-       }
-
-       /* Prepare MUTEXS */
-       member.id = next_member_id();
-       member.session = session;
-       switch_mutex_init(&member.flag_mutex, SWITCH_MUTEX_NESTED, member.pool);
-       switch_mutex_init(&member.audio_in_mutex, SWITCH_MUTEX_NESTED, member.pool);
-       switch_mutex_init(&member.audio_out_mutex, SWITCH_MUTEX_NESTED, member.pool);
-
-       /* Install our Signed Linear codec so we get the audio in that format */
-       switch_core_session_set_read_codec(member.session, &member.read_codec);
-
-
-       mflags = conference->mflags;
-       set_mflags(flags_str, &mflags);
-       switch_set_flag_locked((&member), MFLAG_RUNNING | mflags);
-
-       /* Add the caller to the conference */
-       if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) {
-               goto codec_done1;
-       }
-
-       msg.from = __FILE__;
-
-       /* Tell the channel we are going to be in a bridge */
-       msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE;
-       switch_core_session_receive_message(session, &msg);
-
-       /* Run the confernece loop */
-       conference_loop_output(&member);
-       switch_channel_set_private(channel, "_conference_autocall_list_", NULL);
-
-       /* Tell the channel we are no longer going to be in a bridge */
-       msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
-       switch_core_session_receive_message(session, &msg);
-
-       /* Remove the caller from the conference */
-       conference_del_member(member.conference, &member);
-
-       /* Put the original codec back */
-       switch_core_session_set_read_codec(member.session, NULL);
-
-       /* Clean Up.  codec_done(X): is for error situations after the codecs were setup and done: is for situations before */
 codec_done1:
-       switch_core_codec_destroy(&member.read_codec);
 codec_done2:
-       switch_core_codec_destroy(&member.write_codec);
 done:
-       switch_event_destroy(&params);
-       switch_buffer_destroy(&member.resample_buffer);
-       switch_buffer_destroy(&member.audio_buffer);
-       switch_buffer_destroy(&member.mux_buffer);
-       if (conference && member.dtmf_parser != conference->dtmf_parser) {
-               switch_ivr_digit_stream_parser_destroy(member.dtmf_parser);
-       }
-
-       if (conference) {
-               switch_mutex_lock(conference->mutex);
-               if (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) {
-                       switch_set_flag_locked(conference, CFLAG_DESTRUCT);
-               }
-               switch_mutex_unlock(conference->mutex);
-       }
-
-       /* Release the config registry handle */
-       if (cxml) {
-               switch_xml_free(cxml);
-       }
-
-       if (conference && switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) {
-               char *toplay = NULL;
-               char *dfile = NULL;
-
-               if (conference->sound_prefix) {
-                       dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, conference->kicked_sound);
-                       switch_assert(dfile);
-                       toplay = dfile;
-               } else {
-                       toplay = conference->kicked_sound;
-               }
-
-               switch_ivr_play_file(session, NULL, toplay, NULL);
-               switch_safe_free(dfile);
-       }
-
-       switch_core_session_reset(session, SWITCH_TRUE);
-
-       /* release the readlock */
-       if (rl) {
-               switch_thread_rwlock_unlock(conference->rwlock);
-       }
+    switch_event_create(&params, SWITCH_EVENT_COMMAND);
+    switch_assert(params);
+    switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name);
+    switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name);
+
+    /* Open the config from the xml registry */
+    if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
+        goto done;
+    }
+
+    if ((profiles = switch_xml_child(cfg, "profiles"))) {
+        xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
+    }
+
+    if (!xml_cfg.profile) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name);
+        switch_xml_free(cxml);
+        cxml = NULL;
+        goto done;
+    }
+
+    xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
+
+    /* if this is a bridging call, and it's not a duplicate, build a */
+    /* conference object, and skip pin handling, and locked checking */
+    if (isbr) {
+        char *uuid = switch_core_session_get_uuid(session);
+
+        if (!strcmp(conf_name, "_uuid_")) {
+            conf_name = uuid;
+        }
+
+        if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name);
+            goto done;
+        }
+
+        /* Create the conference object. */
+        conference = conference_new(conf_name, xml_cfg, NULL);
+
+        if (!conference) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+            goto done;
+        }
+
+        switch_channel_set_variable(channel, "conference_name", conference->name);
+
+        /* Set the minimum number of members (once you go above it you cannot go below it) */
+        conference->min = 2;
+
+        /* if the dialplan specified a pin, override the profile's value */
+        if (dpin) {
+            conference->pin = switch_core_strdup(conference->pool, dpin);
+        }
+
+        /* Indicate the conference is dynamic */
+        switch_set_flag_locked(conference, CFLAG_DYNAMIC);
+
+        /* Start the conference thread for this conference */
+        launch_conference_thread(conference);
+
+    } else {
+        /* if the conference exists, get the pointer to it */
+        if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
+            /* couldn't find the conference, create one */
+            conference = conference_new(conf_name, xml_cfg, NULL);
+
+            if (!conference) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+                goto done;
+            }
+
+            /* if the dialplan specified a pin, override the profile's value */
+            if (dpin) {
+                conference->pin = switch_core_strdup(conference->pool, dpin);
+            }
+        
+            switch_channel_set_variable(channel, "conference_name", conference->name);
+
+            /* Set the minimum number of members (once you go above it you cannot go below it) */
+            conference->min = 1;
+
+            /* Indicate the conference is dynamic */
+            switch_set_flag_locked(conference, CFLAG_DYNAMIC);
+
+            /* Start the conference thread for this conference */
+            launch_conference_thread(conference);
+        } else { /* setup user variable */
+            switch_channel_set_variable(channel, "conference_name", conference->name);
+        }
+
+        /* acquire a read lock on the thread so it can't leave without us */
+        if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+            goto done;
+        }
+        rl++;
+
+        /* if this is not an outbound call, deal with conference pins */
+        if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin && *(conference->pin)) {
+            char pin_buf[80] = "";
+            int pin_retries = 3;    /* XXX - this should be configurable - i'm too lazy to do it right now... */
+            int pin_valid = 0;
+            switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+            /* Answer the channel */
+            switch_channel_answer(channel);
+
+            while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) {
+
+                /* be friendly */
+                if (conference->pin_sound) {
+                    conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf));
+                }
+                /* wait for them if neccessary */
+                if (strlen(pin_buf) < strlen(conference->pin)) {
+                    char *buf = pin_buf + strlen(pin_buf);
+                    char term = '\0';
+
+                    status = switch_ivr_collect_digits_count(session,
+                                                             buf,
+                                                             sizeof(pin_buf) - strlen(pin_buf),
+                                                             strlen(conference->pin) - strlen(pin_buf), "#", &term, 10000, 0, 0);
+                    if (status == SWITCH_STATUS_TIMEOUT) {
+                        status = SWITCH_STATUS_SUCCESS;
+                    }
+                }
+
+                pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0);
+                if (!pin_valid) {
+                    /* zero the collected pin */
+                    memset(pin_buf, 0, sizeof(pin_buf));
+
+                    /* more friendliness */
+                    if (conference->bad_pin_sound) {
+                        conference_local_play_file(conference, session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf));
+                    }
+                }
+                pin_retries--;
+            }
+
+            if (!pin_valid) {
+                goto done;
+            }
+        }
+
+        if (conference->special_announce) {
+            conference_local_play_file(conference, session, conference->special_announce, CONF_DEFAULT_LEADIN, NULL, 0);
+        }
+
+        /* don't allow more callers if the conference is locked, unless we invited them */
+        if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name);
+            if (conference->locked_sound) {
+                /* Answer the channel */
+                switch_channel_answer(channel);
+                conference_local_play_file(conference, session, conference->locked_sound, 20, NULL, 0);
+            }
+            goto done;
+        }
+
+        /* dont allow more callers than the max_members allows for -- I explicitly didnt allow outbound calls
+         * someone else can add that (see above) if they feel that outbound calls should be able to violate the
+         * max_members limit
+         */
+        if ((conference->max_members > 0) && (conference->count >= conference->max_members)) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is full.\n", conf_name);
+            if (conference->maxmember_sound) {
+                /* Answer the channel */
+                switch_channel_answer(channel);
+                conference_local_play_file(conference, session, conference->maxmember_sound, 20, NULL, 0);
+            }
+            goto done;
+        }
+
+    }
+
+    /* Release the config registry handle */
+    if (cxml) {
+        switch_xml_free(cxml);
+        cxml = NULL;
+    }
+
+    /* if we're using "bridge:" make an outbound call and bridge it in */
+    if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) {
+        switch_call_cause_t cause;
+        if (conference_outcall(conference, NULL, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) {
+            goto done;
+        }
+    } else {
+        /* if we're not using "bridge:" set the conference answered flag */
+        /* and this isn't an outbound channel, answer the call */
+        if (!switch_channel_test_flag(channel, CF_OUTBOUND))
+            switch_set_flag(conference, CFLAG_ANSWERED);
+    }
+
+    member.orig_read_codec = read_codec;
+    member.native_rate = read_codec->implementation->samples_per_second;
+    member.pool = switch_core_session_get_pool(session);
+
+    /* Setup a Signed Linear codec for reading audio. */
+    if (switch_core_codec_init(&member.read_codec,
+                               "L16",
+                               NULL, read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000,
+                               1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+                          "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
+                          read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
+
+    } else {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
+                          read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
+
+        flags = 0;
+        goto done;
+    }
+
+    member.frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
+    member.frame = switch_core_alloc(member.pool, member.frame_size);
+    member.mux_frame = switch_core_alloc(member.pool, member.frame_size);
+
+    if (read_codec->implementation->actual_samples_per_second != conference->rate) {
+        if (switch_resample_create(&member.read_resampler,
+                                   read_codec->implementation->actual_samples_per_second,
+                                   member.frame_size, conference->rate, member.frame_size, member.pool) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n");
+            goto done;
+        }
+
+
+        member.resample_out = switch_core_alloc(member.pool, member.frame_size);
+        member.resample_out_len = member.frame_size;
+
+        /* Setup an audio buffer for the resampled audio */
+        if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX)
+            != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+            goto done;
+        }
+    }
+
+
+    /* Setup a Signed Linear codec for writing audio. */
+    if (switch_core_codec_init(&member.write_codec,
+                               "L16",
+                               NULL,
+                               conference->rate,
+                               read_codec->implementation->microseconds_per_packet / 1000,
+                               1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+                          "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
+                          conference->rate, read_codec->implementation->microseconds_per_packet / 1000);
+    } else {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
+                          conference->rate, read_codec->implementation->microseconds_per_packet / 1000);
+        flags = 0;
+        goto codec_done2;
+    }
+
+    /* Setup an audio buffer for the incoming audio */
+    if (switch_buffer_create_dynamic(&member.audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+        goto codec_done1;
+    }
+
+    /* Setup an audio buffer for the outgoing audio */
+    if (switch_buffer_create_dynamic(&member.mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+        goto codec_done1;
+    }
+
+    /* Prepare MUTEXS */
+    member.id = next_member_id();
+    member.session = session;
+    switch_mutex_init(&member.flag_mutex, SWITCH_MUTEX_NESTED, member.pool);
+    switch_mutex_init(&member.audio_in_mutex, SWITCH_MUTEX_NESTED, member.pool);
+    switch_mutex_init(&member.audio_out_mutex, SWITCH_MUTEX_NESTED, member.pool);
+
+    /* Install our Signed Linear codec so we get the audio in that format */
+    switch_core_session_set_read_codec(member.session, &member.read_codec);
+
+
+    mflags = conference->mflags;
+    set_mflags(flags_str, &mflags);
+    switch_set_flag_locked((&member), MFLAG_RUNNING | mflags);
+
+    /* Add the caller to the conference */
+    if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) {
+        goto codec_done1;
+    }
+
+    msg.from = __FILE__;
+
+    /* Tell the channel we are going to be in a bridge */
+    msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE;
+    switch_core_session_receive_message(session, &msg);
+
+    /* Run the confernece loop */
+    conference_loop_output(&member);
+    switch_channel_set_private(channel, "_conference_autocall_list_", NULL);
+
+    /* Tell the channel we are no longer going to be in a bridge */
+    msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
+    switch_core_session_receive_message(session, &msg);
+
+    /* Remove the caller from the conference */
+    conference_del_member(member.conference, &member);
+
+    /* Put the original codec back */
+    switch_core_session_set_read_codec(member.session, NULL);
+
+    /* Clean Up.  codec_done(X): is for error situations after the codecs were setup and done: is for situations before */
+ codec_done1:
+    switch_core_codec_destroy(&member.read_codec);
+ codec_done2:
+    switch_core_codec_destroy(&member.write_codec);
+ done:
+    switch_event_destroy(&params);
+    switch_buffer_destroy(&member.resample_buffer);
+    switch_buffer_destroy(&member.audio_buffer);
+    switch_buffer_destroy(&member.mux_buffer);
+    if (conference && member.dtmf_parser != conference->dtmf_parser) {
+        switch_ivr_digit_stream_parser_destroy(member.dtmf_parser);
+    }
+
+    if (conference) {
+        switch_mutex_lock(conference->mutex);
+        if (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) {
+            switch_set_flag_locked(conference, CFLAG_DESTRUCT);
+        }
+        switch_mutex_unlock(conference->mutex);
+    }
+
+    /* Release the config registry handle */
+    if (cxml) {
+        switch_xml_free(cxml);
+    }
+
+    if (conference && switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) {
+        char *toplay = NULL;
+        char *dfile = NULL;
+
+        if (conference->sound_prefix) {
+            dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, conference->kicked_sound);
+            switch_assert(dfile);
+            toplay = dfile;
+        } else {
+            toplay = conference->kicked_sound;
+        }
+
+        switch_ivr_play_file(session, NULL, toplay, NULL);
+        switch_safe_free(dfile);
+    }
+
+    switch_core_session_reset(session, SWITCH_TRUE);
+
+    /* release the readlock */
+    if (rl) {
+        switch_thread_rwlock_unlock(conference->rwlock);
+    }
 }
 
 /* Create a thread for the conference and launch it */
 static void launch_conference_thread(conference_obj_t *conference)
 {
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
-
-       switch_set_flag_locked(conference, CFLAG_RUNNING);
-       switch_threadattr_create(&thd_attr, conference->pool);
-       switch_threadattr_detach_set(thd_attr, 1);
-       switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-       switch_mutex_lock(globals.hash_mutex);
-       switch_core_hash_insert(globals.conference_hash, conference->name, conference);
-       switch_mutex_unlock(globals.hash_mutex);
-       switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool);
-}
-
-
-/* Create a video thread for the conference and launch it */
-static void launch_conference_video_thread(conference_obj_t *conference)
-{
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
-
-       switch_threadattr_create(&thd_attr, conference->pool);
-       switch_threadattr_detach_set(thd_attr, 1);
-       switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-       switch_thread_create(&thread, thd_attr, conference_video_thread_run, conference, conference->pool);
+    switch_thread_t *thread;
+    switch_threadattr_t *thd_attr = NULL;
+
+    switch_set_flag_locked(conference, CFLAG_RUNNING);
+    switch_threadattr_create(&thd_attr, conference->pool);
+    switch_threadattr_detach_set(thd_attr, 1);
+    switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+    switch_mutex_lock(globals.hash_mutex);
+    switch_core_hash_insert(globals.conference_hash, conference->name, conference);
+    switch_mutex_unlock(globals.hash_mutex);
+    switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool);
 }
 
 static void launch_conference_record_thread(conference_obj_t *conference, char *path)
 {
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
-       switch_memory_pool_t *pool;
-       conference_record_t *rec;
-
-       /* Setup a memory pool to use. */
-       if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-       }
-
-       /* Create a node object */
-       if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
-               switch_core_destroy_memory_pool(&pool);
-               return;
-       }
-
-       rec->conference = conference;
-       rec->path = switch_core_strdup(pool, path);
-       rec->pool = pool;
-
-       switch_threadattr_create(&thd_attr, rec->pool);
-       switch_threadattr_detach_set(thd_attr, 1);
-       switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-       switch_thread_create(&thread, thd_attr, conference_record_thread_run, rec, rec->pool);
+    switch_thread_t *thread;
+    switch_threadattr_t *thd_attr = NULL;
+    switch_memory_pool_t *pool;
+    conference_record_t *rec;
+
+    /* Setup a memory pool to use. */
+    if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+    }
+
+    /* Create a node object */
+    if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+        switch_core_destroy_memory_pool(&pool);
+        return;
+    }
+
+    rec->conference = conference;
+    rec->path = switch_core_strdup(pool, path);
+    rec->pool = pool;
+
+    switch_threadattr_create(&thd_attr, rec->pool);
+    switch_threadattr_detach_set(thd_attr, 1);
+    switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+    switch_thread_create(&thread, thd_attr, conference_record_thread_run, rec, rec->pool);
 }
 
 static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint)
 {
-       char name[512] = "", *p, *lbuf = NULL;
-       switch_chat_interface_t *ci;
-       conference_obj_t *conference = NULL;
-       switch_stream_handle_t stream = { 0 };
-
-       if ((p = strchr(to, '+'))) {
-               to = ++p;
-       }
-
-       if (!body) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (!(ci = switch_loadable_module_get_chat_interface(proto))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto);
-               return SWITCH_STATUS_FALSE;
-       }
-
-
-       if ((p = strchr(to, '@'))) {
-               switch_copy_string(name, to, ++p - to);
-       } else {
-               switch_copy_string(name, to, sizeof(name));
-       }
-
-
-       if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) {
-               ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL);
-               return SWITCH_STATUS_FALSE;
-       }
-
-       SWITCH_STANDARD_STREAM(stream);
-
-       if (body != NULL && (lbuf = strdup(body))) {
-               /* special case list */
-               if (switch_stristr("list", lbuf)) {
-                       conference_list_pretty(conference, &stream);
-                       /* provide help */
-               } else {
-                       return SWITCH_STATUS_SUCCESS;
-               }
+    char name[512] = "", *p, *lbuf = NULL;
+    switch_chat_interface_t *ci;
+    conference_obj_t *conference = NULL;
+    switch_stream_handle_t stream = { 0 };
+
+    if ((p = strchr(to, '+'))) {
+        to = ++p;
+    }
+
+    if (!body) {
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    if (!(ci = switch_loadable_module_get_chat_interface(proto))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto);
+        return SWITCH_STATUS_FALSE;
+    }
+
+
+    if ((p = strchr(to, '@'))) {
+        switch_copy_string(name, to, ++p - to);
+    } else {
+        switch_copy_string(name, to, sizeof(name));
+    }
+
+
+    if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) {
+        ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    SWITCH_STANDARD_STREAM(stream);
+
+    if (body != NULL && (lbuf = strdup(body))) {
+        /* special case list */
+        if (switch_stristr("list", lbuf)) {
+            conference_list_pretty(conference, &stream);
+            /* provide help */
+        } else {
+            return SWITCH_STATUS_SUCCESS;
+        }
 #if 0
-               else {
-                       if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) {
-                               stream.write_function(&stream, "%s\n", api_syntax);
-                               /* find a normal command */
-                       } else {
-                               conf_api_dispatch(conference, &stream, argc, argv, (const char *) body, 0);
-                       }
-               }
+        else {
+            if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) {
+                stream.write_function(&stream, "%s\n", api_syntax);
+                /* find a normal command */
+            } else {
+                conf_api_dispatch(conference, &stream, argc, argv, (const char *) body, 0);
+            }
+        }
 #endif
-       }
+    }
 
-       switch_safe_free(lbuf);
-       
-       ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", stream.data, NULL);
-       switch_safe_free(stream.data);
+    switch_safe_free(lbuf);
+    
+    ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", stream.data, NULL);
+    switch_safe_free(stream.data);
 
-       return SWITCH_STATUS_SUCCESS;
+    return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t conf_default_controls(conference_obj_t *conference)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       uint32_t i;
-       caller_control_action_t *action;
-
-       switch_assert(conference != NULL);
-
-       for (i = 0, status = SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i < CCFNTBL_QTY; i++) {
-               if (!switch_strlen_zero(ccfntbl[i].digits)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-                                                         "Installing default caller control action '%s' bound to '%s'.\n", ccfntbl[i].key, ccfntbl[i].digits);
-                       action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
-                       if (action != NULL) {
-                               action->fndesc = &ccfntbl[i];
-                               action->data = NULL;
-                               status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, ccfntbl[i].digits, action);
-                       } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                                 "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
-                               status = SWITCH_STATUS_MEMERR;
-                       }
-               }
-       }
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    uint32_t i;
+    caller_control_action_t *action;
+
+    switch_assert(conference != NULL);
+
+    for (i = 0, status = SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i < CCFNTBL_QTY; i++) {
+        if (!switch_strlen_zero(ccfntbl[i].digits)) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+                              "Installing default caller control action '%s' bound to '%s'.\n", ccfntbl[i].key, ccfntbl[i].digits);
+            action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
+            if (action != NULL) {
+                action->fndesc = &ccfntbl[i];
+                action->data = NULL;
+                status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, ccfntbl[i].digits, action);
+            } else {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+                                  "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
+                status = SWITCH_STATUS_MEMERR;
+            }
+        }
+    }
+
+    return status;
 }
 
 static switch_status_t conference_new_install_caller_controls_custom(conference_obj_t *conference, switch_xml_t xml_controls, switch_xml_t xml_menus)
 {
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       switch_xml_t xml_kvp;
-
-       switch_assert(conference != NULL);
-
-       if (!xml_controls) {
-               return status;
-       }
-
-       /* parse the controls tree for caller control digit strings */
-       for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) {
-               char *key = (char *) switch_xml_attr(xml_kvp, "action");
-               char *val = (char *) switch_xml_attr(xml_kvp, "digits");
-               char *data = (char *) switch_xml_attr_soft(xml_kvp, "data");
-
-               if (!switch_strlen_zero(key) && !switch_strlen_zero(val)) {
-                       uint32_t i;
-
-                       /* scan through all of the valid actions, and if found, */
-                       /* set the new caller control action digit string, then */
-                       /* stop scanning the table, and go to the next xml kvp. */
-                       for (i = 0, status = SWITCH_STATUS_NOOP; i < CCFNTBL_QTY && status == SWITCH_STATUS_NOOP; i++) {
-
-                               if (strcasecmp(ccfntbl[i].key, key) == 0) {
-
-                                       caller_control_action_t *action;
-
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action '%s' bound to '%s'.\n", key, val);
-                                       action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
-                                       if (action != NULL) {
-                                               action->fndesc = &ccfntbl[i];
-                                               action->data = (void *) switch_core_strdup(conference->pool, data);
-                                               action->binded_dtmf = switch_core_strdup(conference->pool, val);
-                                               status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, val, action);
-                                       } else {
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                                                 "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
-                                               status = SWITCH_STATUS_MEMERR;
-                                       }
-                               }
-                       }
-                       if (status == SWITCH_STATUS_NOOP) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control action name '%s'.\n", key);
-                       }
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control config entry pair action = '%s' digits = '%s'\n", key, val);
-               }
-       }
-
-       return status;
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    switch_xml_t xml_kvp;
+
+    switch_assert(conference != NULL);
+
+    if (!xml_controls) {
+        return status;
+    }
+
+    /* parse the controls tree for caller control digit strings */
+    for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) {
+        char *key = (char *) switch_xml_attr(xml_kvp, "action");
+        char *val = (char *) switch_xml_attr(xml_kvp, "digits");
+        char *data = (char *) switch_xml_attr_soft(xml_kvp, "data");
+
+        if (!switch_strlen_zero(key) && !switch_strlen_zero(val)) {
+            uint32_t i;
+
+            /* scan through all of the valid actions, and if found, */
+            /* set the new caller control action digit string, then */
+            /* stop scanning the table, and go to the next xml kvp. */
+            for (i = 0, status = SWITCH_STATUS_NOOP; i < CCFNTBL_QTY && status == SWITCH_STATUS_NOOP; i++) {
+
+                if (strcasecmp(ccfntbl[i].key, key) == 0) {
+
+                    caller_control_action_t *action;
+
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action '%s' bound to '%s'.\n", key, val);
+                    action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
+                    if (action != NULL) {
+                        action->fndesc = &ccfntbl[i];
+                        action->data = (void *) switch_core_strdup(conference->pool, data);
+                        action->binded_dtmf = switch_core_strdup(conference->pool, val);
+                        status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, val, action);
+                    } else {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+                                          "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
+                        status = SWITCH_STATUS_MEMERR;
+                    }
+                }
+            }
+            if (status == SWITCH_STATUS_NOOP) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control action name '%s'.\n", key);
+            }
+        } else {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control config entry pair action = '%s' digits = '%s'\n", key, val);
+        }
+    }
+
+    return status;
 }
 
 /* create a new conferene with a specific profile */
 static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool)
 {
-       conference_obj_t *conference;
-       switch_xml_t xml_kvp;
-       char *timer_name = NULL;
-       char *domain = NULL;
-       char *tts_engine = NULL;
-       char *tts_voice = NULL;
-       char *enter_sound = NULL;
-       char *sound_prefix = NULL;
-       char *exit_sound = NULL;
-       char *alone_sound = NULL;
-       char *ack_sound = NULL;
-       char *nack_sound = NULL;
-       char *muted_sound = NULL;
-       char *unmuted_sound = NULL;
-       char *locked_sound = NULL;
-       char *is_locked_sound = NULL;
-       char *is_unlocked_sound = NULL;
-       char *kicked_sound = NULL;
-       char *pin = NULL;
-       char *pin_sound = NULL;
-       char *bad_pin_sound = NULL;
-       char *energy_level = NULL;
-       char *caller_id_name = NULL;
-       char *caller_id_number = NULL;
-       char *caller_controls = NULL;
-       char *member_flags = NULL;
-       char *perpetual_sound = NULL;
-       char *moh_sound = NULL;
-       uint32_t max_members = 0;
-       uint32_t announce_count = 0;
-       char *maxmember_sound = NULL;
-       uint32_t rate = 8000, interval = 20;
-       switch_status_t status;
-       int comfort_noise_level = 0;
-       char *suppress_events = NULL;
-       char *auto_record = NULL;
-
-       /* Validate the conference name */
-       if (switch_strlen_zero(name)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Record! no name.\n");
-               return NULL;
-       }
-
-       /* parse the profile tree for param values */
-       for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) {
-               char *var = (char *) switch_xml_attr_soft(xml_kvp, "name");
-               char *val = (char *) switch_xml_attr_soft(xml_kvp, "value");
-               char buf[128] = "";
-               char *p;
-
-               if ((p = strchr(var, '_'))) {
-                       switch_copy_string(buf, var, sizeof(buf));
-                       for (p = buf; *p; p++) {
-                               if (*p == '_') {
-                                       *p = '-';
-                               }
-                       }
-                       var = buf;
-               }
-
-               if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) {
-                       uint32_t tmp = atoi(val);
-                       if (tmp == 8000 || tmp == 16000 || tmp == 32000) {
-                               rate = tmp;
-                       }
-               } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) {
-                       domain = val;
-               } else if (!strcasecmp(var, "interval") && !switch_strlen_zero(val)) {
-                       uint32_t tmp = atoi(val);
-                       if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) {
-                               interval = tmp;
-                       } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-                                                                 "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
-                       }
-               } else if (!strcasecmp(var, "timer-name") && !switch_strlen_zero(val)) {
-                       timer_name = val;
-               } else if (!strcasecmp(var, "tts-engine") && !switch_strlen_zero(val)) {
-                       tts_engine = val;
-               } else if (!strcasecmp(var, "tts-voice") && !switch_strlen_zero(val)) {
-                       tts_voice = val;
-               } else if (!strcasecmp(var, "enter-sound") && !switch_strlen_zero(val)) {
-                       enter_sound = val;
-               } else if (!strcasecmp(var, "exit-sound") && !switch_strlen_zero(val)) {
-                       exit_sound = val;
-               } else if (!strcasecmp(var, "alone-sound") && !switch_strlen_zero(val)) {
-                       alone_sound = val;
-               } else if (!strcasecmp(var, "perpetual-sound") && !switch_strlen_zero(val)) {
-                       perpetual_sound = val;
-               } else if (!strcasecmp(var, "moh-sound") && !switch_strlen_zero(val)) {
-                       moh_sound = val;
-               } else if (!strcasecmp(var, "ack-sound") && !switch_strlen_zero(val)) {
-                       ack_sound = val;
-               } else if (!strcasecmp(var, "nack-sound") && !switch_strlen_zero(val)) {
-                       nack_sound = val;
-               } else if (!strcasecmp(var, "muted-sound") && !switch_strlen_zero(val)) {
-                       muted_sound = val;
-               } else if (!strcasecmp(var, "unmuted-sound") && !switch_strlen_zero(val)) {
-                       unmuted_sound = val;
-               } else if (!strcasecmp(var, "locked-sound") && !switch_strlen_zero(val)) {
-                       locked_sound = val;
-               } else if (!strcasecmp(var, "is-locked-sound") && !switch_strlen_zero(val)) {
-                       is_locked_sound = val;
-               } else if (!strcasecmp(var, "is-unlocked-sound") && !switch_strlen_zero(val)) {
-                       is_unlocked_sound = val;
-               } else if (!strcasecmp(var, "member-flags") && !switch_strlen_zero(val)) {
-                       member_flags = val;
-               } else if (!strcasecmp(var, "kicked-sound") && !switch_strlen_zero(val)) {
-                       kicked_sound = val;
-               } else if (!strcasecmp(var, "pin") && !switch_strlen_zero(val)) {
-                       pin = val;
-               } else if (!strcasecmp(var, "pin-sound") && !switch_strlen_zero(val)) {
-                       pin_sound = val;
-               } else if (!strcasecmp(var, "bad-pin-sound") && !switch_strlen_zero(val)) {
-                       bad_pin_sound = val;
-               } else if (!strcasecmp(var, "energy-level") && !switch_strlen_zero(val)) {
-                       energy_level = val;
-               } else if (!strcasecmp(var, "caller-id-name") && !switch_strlen_zero(val)) {
-                       caller_id_name = val;
-               } else if (!strcasecmp(var, "caller-id-number") && !switch_strlen_zero(val)) {
-                       caller_id_number = val;
-               } else if (!strcasecmp(var, "caller-controls") && !switch_strlen_zero(val)) {
-                       caller_controls = val;
-               } else if (!strcasecmp(var, "comfort-noise") && !switch_strlen_zero(val)) {
-                       int tmp;
-                       tmp = atoi(val);
-                       if (tmp > 1 && tmp < 10000) {
-                               comfort_noise_level = tmp;
-                       } else if (switch_true(val)) {
-                               comfort_noise_level = 1400;
-                       }
-               } else if (!strcasecmp(var, "sound-prefix") && !switch_strlen_zero(val)) {
-                       sound_prefix = val;
-               } else if (!strcasecmp(var, "max-members") && !switch_strlen_zero(val)) {
-                       errno = 0;                      /* sanity first */
-                       max_members = strtol(val, NULL, 0);     /* base 0 lets 0x... for hex 0... for octal and base 10 otherwise through */
-                       if (errno == ERANGE || errno == EINVAL || max_members < 0 || max_members == 1) {
-                               /* a negative wont work well, and its foolish to have a conference limited to 1 person unless the outbound 
-                                * stuff is added, see comments above
-                                */
-                               max_members = 0;        /* set to 0 to disable max counts */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "max-members %s is invalid, not setting a limit\n", val);
-                       }
-               } else if (!strcasecmp(var, "max-members-sound") && !switch_strlen_zero(val)) {
-                       maxmember_sound = val;
-               } else if (!strcasecmp(var, "announce-count") && !switch_strlen_zero(val)) {
-                       errno = 0;                      /* safety first */
-                       announce_count = strtol(val, NULL, 0);
-                       if (errno == ERANGE || errno == EINVAL) {
-                               announce_count = 0;
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "announce-count is invalid, not anouncing member counts\n");
-                       }
-               } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) {
-                       suppress_events = val;
-               } else if (!strcasecmp(var, "auto-record") && !switch_strlen_zero(val)) {
-                       auto_record = val;
-               }
-       }
-
-       /* Set defaults and various paramaters */
-
-       /* Timer module to use */
-       if (switch_strlen_zero(timer_name)) {
-               timer_name = "soft";
-       }
-
-       /* Caller ID Name */
-       if (switch_strlen_zero(caller_id_name)) {
-               caller_id_name = (char *) global_app_name;
-       }
-
-       /* Caller ID Number */
-       if (switch_strlen_zero(caller_id_number)) {
-               caller_id_number = "0000000000";
-       }
-
-       if (!pool) {
-               /* Setup a memory pool to use. */
-               if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
-                       status = SWITCH_STATUS_TERM;
-                       return NULL;
-               }
-       }
-
-       /* Create the conference object. */
-       if (!(conference = switch_core_alloc(pool, sizeof(*conference)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
-               status = SWITCH_STATUS_TERM;
-               return NULL;
-       }
-
-       /* initialize the conference object with settings from the specified profile */
-       conference->pool = pool;
-       conference->profile_name = switch_core_strdup(conference->pool, switch_xml_attr_soft(cfg.profile, "name"));
-       if (timer_name) {
-               conference->timer_name = switch_core_strdup(conference->pool, timer_name);
-       }
-       if (tts_engine) {
-               conference->tts_engine = switch_core_strdup(conference->pool, tts_engine);
-       }
-       if (tts_voice) {
-               conference->tts_voice = switch_core_strdup(conference->pool, tts_voice);
-       }
-
-       conference->comfort_noise_level = comfort_noise_level;
-       conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name);
-       conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number);
-
-
-       if (!switch_strlen_zero(perpetual_sound)) {
-               conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound);
-       }
-
-       conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR;
-       
-       if (!switch_strlen_zero(moh_sound) && switch_is_moh(moh_sound)) {
-               conference->moh_sound = switch_core_strdup(conference->pool, moh_sound);
-       }
-
-       if (member_flags) {
-               set_mflags(member_flags, &conference->mflags);
-       }
-
-       if (sound_prefix) {
-               conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix);
-       }
-
-       if (!switch_strlen_zero(enter_sound)) {
-               conference->enter_sound = switch_core_strdup(conference->pool, enter_sound);
-       }
-
-       if (!switch_strlen_zero(exit_sound)) {
-               conference->exit_sound = switch_core_strdup(conference->pool, exit_sound);
-       }
-
-       if (!switch_strlen_zero(ack_sound)) {
-               conference->ack_sound = switch_core_strdup(conference->pool, ack_sound);
-       }
-
-       if (!switch_strlen_zero(nack_sound)) {
-               conference->nack_sound = switch_core_strdup(conference->pool, nack_sound);
-       }
-
-       if (!switch_strlen_zero(muted_sound)) {
-               conference->muted_sound = switch_core_strdup(conference->pool, muted_sound);
-       }
-
-       if (!switch_strlen_zero(unmuted_sound)) {
-               conference->unmuted_sound = switch_core_strdup(conference->pool, unmuted_sound);
-       }
-
-       if (!switch_strlen_zero(kicked_sound)) {
-               conference->kicked_sound = switch_core_strdup(conference->pool, kicked_sound);
-       }
-
-       if (!switch_strlen_zero(pin_sound)) {
-               conference->pin_sound = switch_core_strdup(conference->pool, pin_sound);
-       }
-
-       if (!switch_strlen_zero(bad_pin_sound)) {
-               conference->bad_pin_sound = switch_core_strdup(conference->pool, bad_pin_sound);
-       }
-
-       if (!switch_strlen_zero(pin)) {
-               conference->pin = switch_core_strdup(conference->pool, pin);
-       }
-
-       if (!switch_strlen_zero(alone_sound)) {
-               conference->alone_sound = switch_core_strdup(conference->pool, alone_sound);
-       }
-
-       if (!switch_strlen_zero(locked_sound)) {
-               conference->locked_sound = switch_core_strdup(conference->pool, locked_sound);
-       }
-
-       if (!switch_strlen_zero(is_locked_sound)) {
-               conference->is_locked_sound = switch_core_strdup(conference->pool, is_locked_sound);
-       }
-
-       if (!switch_strlen_zero(is_unlocked_sound)) {
-               conference->is_unlocked_sound = switch_core_strdup(conference->pool, is_unlocked_sound);
-       }
-
-       if (!switch_strlen_zero(energy_level)) {
-               conference->energy_level = atoi(energy_level);
-       }
-
-       if (!switch_strlen_zero(maxmember_sound)) {
-               conference->maxmember_sound = switch_core_strdup(conference->pool, maxmember_sound);
-       }
-       /* its going to be 0 by default, set to a value otherwise so this should be safe */
-       conference->max_members = max_members;
-       conference->announce_count = announce_count;
-
-       conference->name = switch_core_strdup(conference->pool, name);
-       if (domain) {
-               conference->domain = switch_core_strdup(conference->pool, domain);
-       } else {
-               conference->domain = "cluecon.com";
-       }
-       conference->rate = rate;
-       conference->interval = interval;
-       conference->dtmf_parser = NULL;
-
-       conference->eflags = 0xFFFFFFFF;
-       if (!switch_strlen_zero(suppress_events)) {
-               clear_eflags(suppress_events, &conference->eflags);
-       }
-
-       if (!switch_strlen_zero(auto_record)) {
-               conference->auto_record = switch_core_strdup(conference->pool, auto_record);
-       }
-       
-       /* caller control configuration chores */
-       if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {
-
-               /* if no controls, or default controls specified, install default */
-               if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) {
-                       status = conf_default_controls(conference);
-               } else if (strcasecmp(caller_controls, "none") != 0) {
-                       /* try to build caller control if the group has been specified and != "none" */
-                       switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls);
-                       status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL);
-
-                       if (status != SWITCH_STATUS_SUCCESS) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls);
-                       }
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No caller controls installed.\n");
-               }
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n");
-       }
-
-       /* Activate the conference mutex for exclusivity */
-       switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool);
-       switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool);
-       switch_thread_rwlock_create(&conference->rwlock, conference->pool);
-       switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool);
-
-       return conference;
+    conference_obj_t *conference;
+    switch_xml_t xml_kvp;
+    char *timer_name = NULL;
+    char *domain = NULL;
+    char *tts_engine = NULL;
+    char *tts_voice = NULL;
+    char *enter_sound = NULL;
+    char *sound_prefix = NULL;
+    char *exit_sound = NULL;
+    char *alone_sound = NULL;
+    char *ack_sound = NULL;
+    char *nack_sound = NULL;
+    char *muted_sound = NULL;
+    char *unmuted_sound = NULL;
+    char *locked_sound = NULL;
+    char *is_locked_sound = NULL;
+    char *is_unlocked_sound = NULL;
+    char *kicked_sound = NULL;
+    char *pin = NULL;
+    char *pin_sound = NULL;
+    char *bad_pin_sound = NULL;
+    char *energy_level = NULL;
+    char *caller_id_name = NULL;
+    char *caller_id_number = NULL;
+    char *caller_controls = NULL;
+    char *member_flags = NULL;
+    char *perpetual_sound = NULL;
+    char *moh_sound = NULL;
+    uint32_t max_members = 0;
+    uint32_t announce_count = 0;
+    char *maxmember_sound = NULL;
+    uint32_t rate = 8000, interval = 20;
+    switch_status_t status;
+    int comfort_noise_level = 0;
+    char *suppress_events = NULL;
+    char *auto_record = NULL;
+
+    /* Validate the conference name */
+    if (switch_strlen_zero(name)) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Record! no name.\n");
+        return NULL;
+    }
+
+    /* parse the profile tree for param values */
+    for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) {
+        char *var = (char *) switch_xml_attr_soft(xml_kvp, "name");
+        char *val = (char *) switch_xml_attr_soft(xml_kvp, "value");
+        char buf[128] = "";
+        char *p;
+
+        if ((p = strchr(var, '_'))) {
+            switch_copy_string(buf, var, sizeof(buf));
+            for (p = buf; *p; p++) {
+                if (*p == '_') {
+                    *p = '-';
+                }
+            }
+            var = buf;
+        }
+
+        if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) {
+            uint32_t tmp = atoi(val);
+            if (tmp == 8000 || tmp == 16000 || tmp == 32000) {
+                rate = tmp;
+            }
+        } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) {
+            domain = val;
+        } else if (!strcasecmp(var, "interval") && !switch_strlen_zero(val)) {
+            uint32_t tmp = atoi(val);
+            if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) {
+                interval = tmp;
+            } else {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+                                  "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
+            }
+        } else if (!strcasecmp(var, "timer-name") && !switch_strlen_zero(val)) {
+            timer_name = val;
+        } else if (!strcasecmp(var, "tts-engine") && !switch_strlen_zero(val)) {
+            tts_engine = val;
+        } else if (!strcasecmp(var, "tts-voice") && !switch_strlen_zero(val)) {
+            tts_voice = val;
+        } else if (!strcasecmp(var, "enter-sound") && !switch_strlen_zero(val)) {
+            enter_sound = val;
+        } else if (!strcasecmp(var, "exit-sound") && !switch_strlen_zero(val)) {
+            exit_sound = val;
+        } else if (!strcasecmp(var, "alone-sound") && !switch_strlen_zero(val)) {
+            alone_sound = val;
+        } else if (!strcasecmp(var, "perpetual-sound") && !switch_strlen_zero(val)) {
+            perpetual_sound = val;
+        } else if (!strcasecmp(var, "moh-sound") && !switch_strlen_zero(val)) {
+            moh_sound = val;
+        } else if (!strcasecmp(var, "ack-sound") && !switch_strlen_zero(val)) {
+            ack_sound = val;
+        } else if (!strcasecmp(var, "nack-sound") && !switch_strlen_zero(val)) {
+            nack_sound = val;
+        } else if (!strcasecmp(var, "muted-sound") && !switch_strlen_zero(val)) {
+            muted_sound = val;
+        } else if (!strcasecmp(var, "unmuted-sound") && !switch_strlen_zero(val)) {
+            unmuted_sound = val;
+        } else if (!strcasecmp(var, "locked-sound") && !switch_strlen_zero(val)) {
+            locked_sound = val;
+        } else if (!strcasecmp(var, "is-locked-sound") && !switch_strlen_zero(val)) {
+            is_locked_sound = val;
+        } else if (!strcasecmp(var, "is-unlocked-sound") && !switch_strlen_zero(val)) {
+            is_unlocked_sound = val;
+        } else if (!strcasecmp(var, "member-flags") && !switch_strlen_zero(val)) {
+            member_flags = val;
+        } else if (!strcasecmp(var, "kicked-sound") && !switch_strlen_zero(val)) {
+            kicked_sound = val;
+        } else if (!strcasecmp(var, "pin") && !switch_strlen_zero(val)) {
+            pin = val;
+        } else if (!strcasecmp(var, "pin-sound") && !switch_strlen_zero(val)) {
+            pin_sound = val;
+        } else if (!strcasecmp(var, "bad-pin-sound") && !switch_strlen_zero(val)) {
+            bad_pin_sound = val;
+        } else if (!strcasecmp(var, "energy-level") && !switch_strlen_zero(val)) {
+            energy_level = val;
+        } else if (!strcasecmp(var, "caller-id-name") && !switch_strlen_zero(val)) {
+            caller_id_name = val;
+        } else if (!strcasecmp(var, "caller-id-number") && !switch_strlen_zero(val)) {
+            caller_id_number = val;
+        } else if (!strcasecmp(var, "caller-controls") && !switch_strlen_zero(val)) {
+            caller_controls = val;
+        } else if (!strcasecmp(var, "comfort-noise") && !switch_strlen_zero(val)) {
+            int tmp;
+            tmp = atoi(val);
+            if (tmp > 1 && tmp < 10000) {
+                comfort_noise_level = tmp;
+            } else if (switch_true(val)) {
+                comfort_noise_level = 1400;
+            }
+        } else if (!strcasecmp(var, "sound-prefix") && !switch_strlen_zero(val)) {
+            sound_prefix = val;
+        } else if (!strcasecmp(var, "max-members") && !switch_strlen_zero(val)) {
+            errno = 0;          /* sanity first */
+            max_members = strtol(val, NULL, 0); /* base 0 lets 0x... for hex 0... for octal and base 10 otherwise through */
+            if (errno == ERANGE || errno == EINVAL || max_members < 0 || max_members == 1) {
+                /* a negative wont work well, and its foolish to have a conference limited to 1 person unless the outbound 
+                 * stuff is added, see comments above
+                 */
+                max_members = 0;    /* set to 0 to disable max counts */
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "max-members %s is invalid, not setting a limit\n", val);
+            }
+        } else if (!strcasecmp(var, "max-members-sound") && !switch_strlen_zero(val)) {
+            maxmember_sound = val;
+        } else if (!strcasecmp(var, "announce-count") && !switch_strlen_zero(val)) {
+            errno = 0;          /* safety first */
+            announce_count = strtol(val, NULL, 0);
+            if (errno == ERANGE || errno == EINVAL) {
+                announce_count = 0;
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "announce-count is invalid, not anouncing member counts\n");
+            }
+        } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) {
+            suppress_events = val;
+        } else if (!strcasecmp(var, "auto-record") && !switch_strlen_zero(val)) {
+            auto_record = val;
+        }
+    }
+
+    /* Set defaults and various paramaters */
+
+    /* Timer module to use */
+    if (switch_strlen_zero(timer_name)) {
+        timer_name = "soft";
+    }
+
+    /* Caller ID Name */
+    if (switch_strlen_zero(caller_id_name)) {
+        caller_id_name = (char *) global_app_name;
+    }
+
+    /* Caller ID Number */
+    if (switch_strlen_zero(caller_id_number)) {
+        caller_id_number = "0000000000";
+    }
+
+    if (!pool) {
+        /* Setup a memory pool to use. */
+        if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+            status = SWITCH_STATUS_TERM;
+            return NULL;
+        }
+    }
+
+    /* Create the conference object. */
+    if (!(conference = switch_core_alloc(pool, sizeof(*conference)))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+        status = SWITCH_STATUS_TERM;
+        return NULL;
+    }
+
+    /* initialize the conference object with settings from the specified profile */
+    conference->pool = pool;
+    conference->profile_name = switch_core_strdup(conference->pool, switch_xml_attr_soft(cfg.profile, "name"));
+    if (timer_name) {
+        conference->timer_name = switch_core_strdup(conference->pool, timer_name);
+    }
+    if (tts_engine) {
+        conference->tts_engine = switch_core_strdup(conference->pool, tts_engine);
+    }
+    if (tts_voice) {
+        conference->tts_voice = switch_core_strdup(conference->pool, tts_voice);
+    }
+
+    conference->comfort_noise_level = comfort_noise_level;
+    conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name);
+    conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number);
+
+
+    if (!switch_strlen_zero(perpetual_sound)) {
+        conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound);
+    }
+
+    conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR;
+    
+    if (!switch_strlen_zero(moh_sound) && switch_is_moh(moh_sound)) {
+        conference->moh_sound = switch_core_strdup(conference->pool, moh_sound);
+    }
+
+    if (member_flags) {
+        set_mflags(member_flags, &conference->mflags);
+    }
+
+    if (sound_prefix) {
+        conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix);
+    }
+
+    if (!switch_strlen_zero(enter_sound)) {
+        conference->enter_sound = switch_core_strdup(conference->pool, enter_sound);
+    }
+
+    if (!switch_strlen_zero(exit_sound)) {
+        conference->exit_sound = switch_core_strdup(conference->pool, exit_sound);
+    }
+
+    if (!switch_strlen_zero(ack_sound)) {
+        conference->ack_sound = switch_core_strdup(conference->pool, ack_sound);
+    }
+
+    if (!switch_strlen_zero(nack_sound)) {
+        conference->nack_sound = switch_core_strdup(conference->pool, nack_sound);
+    }
+
+    if (!switch_strlen_zero(muted_sound)) {
+        conference->muted_sound = switch_core_strdup(conference->pool, muted_sound);
+    }
+
+    if (!switch_strlen_zero(unmuted_sound)) {
+        conference->unmuted_sound = switch_core_strdup(conference->pool, unmuted_sound);
+    }
+
+    if (!switch_strlen_zero(kicked_sound)) {
+        conference->kicked_sound = switch_core_strdup(conference->pool, kicked_sound);
+    }
+
+    if (!switch_strlen_zero(pin_sound)) {
+        conference->pin_sound = switch_core_strdup(conference->pool, pin_sound);
+    }
+
+    if (!switch_strlen_zero(bad_pin_sound)) {
+        conference->bad_pin_sound = switch_core_strdup(conference->pool, bad_pin_sound);
+    }
+
+    if (!switch_strlen_zero(pin)) {
+        conference->pin = switch_core_strdup(conference->pool, pin);
+    }
+
+    if (!switch_strlen_zero(alone_sound)) {
+        conference->alone_sound = switch_core_strdup(conference->pool, alone_sound);
+    }
+
+    if (!switch_strlen_zero(locked_sound)) {
+        conference->locked_sound = switch_core_strdup(conference->pool, locked_sound);
+    }
+
+    if (!switch_strlen_zero(is_locked_sound)) {
+        conference->is_locked_sound = switch_core_strdup(conference->pool, is_locked_sound);
+    }
+
+    if (!switch_strlen_zero(is_unlocked_sound)) {
+        conference->is_unlocked_sound = switch_core_strdup(conference->pool, is_unlocked_sound);
+    }
+
+    if (!switch_strlen_zero(energy_level)) {
+        conference->energy_level = atoi(energy_level);
+    }
+
+    if (!switch_strlen_zero(maxmember_sound)) {
+        conference->maxmember_sound = switch_core_strdup(conference->pool, maxmember_sound);
+    }
+    /* its going to be 0 by default, set to a value otherwise so this should be safe */
+    conference->max_members = max_members;
+    conference->announce_count = announce_count;
+
+    conference->name = switch_core_strdup(conference->pool, name);
+    if (domain) {
+        conference->domain = switch_core_strdup(conference->pool, domain);
+    } else {
+        conference->domain = "cluecon.com";
+    }
+    conference->rate = rate;
+    conference->interval = interval;
+    conference->dtmf_parser = NULL;
+
+    conference->eflags = 0xFFFFFFFF;
+    if (!switch_strlen_zero(suppress_events)) {
+        clear_eflags(suppress_events, &conference->eflags);
+    }
+
+    if (!switch_strlen_zero(auto_record)) {
+        conference->auto_record = switch_core_strdup(conference->pool, auto_record);
+    }
+    
+    /* caller control configuration chores */
+    if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {
+
+        /* if no controls, or default controls specified, install default */
+        if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) {
+            status = conf_default_controls(conference);
+        } else if (strcasecmp(caller_controls, "none") != 0) {
+            /* try to build caller control if the group has been specified and != "none" */
+            switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls);
+            status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL);
+
+            if (status != SWITCH_STATUS_SUCCESS) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls);
+            }
+        } else {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No caller controls installed.\n");
+        }
+    } else {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n");
+    }
+
+    /* Activate the conference mutex for exclusivity */
+    switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool);
+    switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool);
+    switch_thread_rwlock_create(&conference->rwlock, conference->pool);
+    switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool);
+
+    return conference;
 }
 
 static void pres_event_handler(switch_event_t *event)
 {
-       char *to = switch_event_get_header(event, "to");
-       char *dup_to = NULL, *conf_name, *e;
-       conference_obj_t *conference;
-
-       if (!to || strncasecmp(to, "conf+", 5)) {
-               return;
-       }
-
-       if (!(dup_to = strdup(to))) {
-               return;
-       }
-
-       conf_name = dup_to + 5;
-
-       if ((e = strchr(conf_name, '@'))) {
-               *e = '\0';
-       }
-
-       if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
-               if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conf_name);
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
-                       switch_event_fire(&event);
-               }
-       } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conf_name);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", to);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "Idle");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conf_name);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "terminated");
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", "inbound");
-               switch_event_fire(&event);
-       }
-
-       switch_safe_free(dup_to);
+    char *to = switch_event_get_header(event, "to");
+    char *dup_to = NULL, *conf_name, *e;
+    conference_obj_t *conference;
+
+    if (!to || strncasecmp(to, "conf+", 5)) {
+        return;
+    }
+
+    if (!(dup_to = strdup(to))) {
+        return;
+    }
+
+    conf_name = dup_to + 5;
+
+    if ((e = strchr(conf_name, '@'))) {
+        *e = '\0';
+    }
+
+    if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) {
+        if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain);
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+            switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conf_name);
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed");
+            switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound");
+            switch_event_fire(&event);
+        }
+    } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conf_name);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", to);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "Idle");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conf_name);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "terminated");
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", "inbound");
+        switch_event_fire(&event);
+    }
+
+    switch_safe_free(dup_to);
 }
 
 static void send_presence(switch_event_types_t id)
 {
-       switch_xml_t cxml, cfg, advertise, room;
-       switch_event_t *params = NULL;
-
-       switch_event_create(&params, SWITCH_EVENT_COMMAND);
-       switch_assert(params);
-       switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "presence", "true");
-
-
-       /* Open the config from the xml registry */
-       if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
-               goto done;
-       }
-
-       if ((advertise = switch_xml_child(cfg, "advertise"))) {
-               for (room = switch_xml_child(advertise, "room"); room; room = room->next) {
-                       char *name = (char *) switch_xml_attr_soft(room, "name");
-                       char *status = (char *) switch_xml_attr_soft(room, "status");
-                       switch_event_t *event;
-
-                       if (name && switch_event_create(&event, id) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", name);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", name);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status ? status : "Available");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-                               switch_event_fire(&event);
-                       }
-               }
-       }
-
 done:
-       switch_event_destroy(&params);
-
-       /* Release the config registry handle */
-       if (cxml) {
-               switch_xml_free(cxml);
-               cxml = NULL;
-       }
+    switch_xml_t cxml, cfg, advertise, room;
+    switch_event_t *params = NULL;
+
+    switch_event_create(&params, SWITCH_EVENT_COMMAND);
+    switch_assert(params);
+    switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "presence", "true");
+
+
+    /* Open the config from the xml registry */
+    if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
+        goto done;
+    }
+
+    if ((advertise = switch_xml_child(cfg, "advertise"))) {
+        for (room = switch_xml_child(advertise, "room"); room; room = room->next) {
+            char *name = (char *) switch_xml_attr_soft(room, "name");
+            char *status = (char *) switch_xml_attr_soft(room, "status");
+            switch_event_t *event;
+
+            if (name && switch_event_create(&event, id) == SWITCH_STATUS_SUCCESS) {
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", name);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", name);
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status ? status : "Available");
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", "idle");
+                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+                switch_event_fire(&event);
+            }
+        }
+    }
+
+ done:
+    switch_event_destroy(&params);
+
+    /* Release the config registry handle */
+    if (cxml) {
+        switch_xml_free(cxml);
+        cxml = NULL;
+    }
 }
 
 /* Called by FreeSWITCH when the module loads */
 SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load)
 {
-       uint32_t i;
-       size_t nl, ol = 0;
-       char *p = NULL, *tmp = NULL;
-       switch_chat_interface_t *chat_interface;
-       switch_api_interface_t *api_interface;
-       switch_application_interface_t *app_interface;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-       memset(&globals, 0, sizeof(globals));
-
-       /* Connect my internal structure to the blank pointer passed to me */
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-       /* build api interface help ".syntax" field string */
-       p = strdup("");
-       for (i = 0; i < CONFFUNCAPISIZE; i++) {
-               nl = strlen(conf_api_sub_commands[i].psyntax) + 4;
-               if (p != NULL) {
-                       ol = strlen(p);
-               }
-               tmp = realloc(p, ol + nl);
-               if (tmp != NULL) {
-                       p = tmp;
-                       strcat(p, "\t\t");
-                       strcat(p, conf_api_sub_commands[i].psyntax);
-                       if (i < CONFFUNCAPISIZE - 1) {
-                               strcat(p, "\n");
-                       }
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't realloc\n");
-                       return SWITCH_STATUS_TERM;
-               }
-
-       }
-       api_syntax = p;
-
-       /* create/register custom event message type */
-       if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT);
-               return SWITCH_STATUS_TERM;
-       }
-
-       /* Setup the pool */
-       globals.conference_pool = pool;
-
-       /* Setup a hash to store conferences by name */
-       switch_core_hash_init(&globals.conference_hash, globals.conference_pool);
-       switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
-       switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
-       switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
-
-       /* Subscribe to presence request events */
-       if (switch_event_bind_removable(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p);
-       SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE);
-       SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE);
-       SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send);
-
-       send_presence(SWITCH_EVENT_PRESENCE_IN);
-
-       globals.running = 1;
-       /* indicate that the module should continue to be loaded */
-       return status;
+    uint32_t i;
+    size_t nl, ol = 0;
+    char *p = NULL, *tmp = NULL;
+    switch_chat_interface_t *chat_interface;
+    switch_api_interface_t *api_interface;
+    switch_application_interface_t *app_interface;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+    memset(&globals, 0, sizeof(globals));
+
+    /* Connect my internal structure to the blank pointer passed to me */
+    *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+    /* build api interface help ".syntax" field string */
+    p = strdup("");
+    for (i = 0; i < CONFFUNCAPISIZE; i++) {
+        nl = strlen(conf_api_sub_commands[i].psyntax) + 4;
+        if (p != NULL) {
+            ol = strlen(p);
+        }
+        tmp = realloc(p, ol + nl);
+        if (tmp != NULL) {
+            p = tmp;
+            strcat(p, "\t\t");
+            strcat(p, conf_api_sub_commands[i].psyntax);
+            if (i < CONFFUNCAPISIZE - 1) {
+                strcat(p, "\n");
+            }
+        } else {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't realloc\n");
+            return SWITCH_STATUS_TERM;
+        }
+
+    }
+    api_syntax = p;
+
+    /* create/register custom event message type */
+    if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT);
+        return SWITCH_STATUS_TERM;
+    }
+
+    /* Setup the pool */
+    globals.conference_pool = pool;
+
+    /* Setup a hash to store conferences by name */
+    switch_core_hash_init(&globals.conference_hash, globals.conference_pool);
+    switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
+    switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
+    switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool);
+
+    /* Subscribe to presence request events */
+    if (switch_event_bind_removable(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n");
+        return SWITCH_STATUS_GENERR;
+    }
+
+    SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p);
+    SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE);
+    SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE);
+    SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send);
+
+    send_presence(SWITCH_EVENT_PRESENCE_IN);
+
+    globals.running = 1;
+    /* indicate that the module should continue to be loaded */
+    return status;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_conference_shutdown)
 {
-       if (globals.running) {
+    if (globals.running) {
 
-               /* signal all threads to shutdown */
-               globals.running = 0;
+        /* signal all threads to shutdown */
+        globals.running = 0;
 
-               /* wait for all threads */
-               while (globals.threads) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d threads\n", globals.threads);
-                       switch_yield(100000);
-               }
+        /* wait for all threads */
+        while (globals.threads) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d threads\n", globals.threads);
+            switch_yield(100000);
+        }
 
-               switch_event_unbind(&globals.node);
-               switch_event_free_subclass(CONF_EVENT_MAINT);
+        switch_event_unbind(&globals.node);
+        switch_event_free_subclass(CONF_EVENT_MAINT);
 
-               /* free api interface help ".syntax" field string */
-               switch_safe_free(api_syntax);
-       }
-       switch_core_hash_destroy(&globals.conference_hash);
+        /* free api interface help ".syntax" field string */
+        switch_safe_free(api_syntax);
+    }
+    switch_core_hash_destroy(&globals.conference_hash);
 
-       return SWITCH_STATUS_SUCCESS;
+    return SWITCH_STATUS_SUCCESS;
 }
 
 /* For Emacs:
index ed121aa15484ed6b37133419db6635d7d5feca8e..96354feac05ba595c4469d1ec29bf7a3d0c5fde6 100644 (file)
@@ -686,6 +686,38 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                                *frame = NULL;
                                                return SWITCH_STATUS_GENERR;
                                        }
+
+
+                                       if (tech_pvt->check_frames < 50) {
+                                               if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) {
+                                                       switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - 
+                                                                                                                  tech_pvt->last_ts) / (tech_pvt->read_codec.implementation->samples_per_second / 1000);
+                                                       
+                                                       if ((codec_ms % 10) != 0) {
+                                                               tech_pvt->check_frames = 50;
+                                                       } else {
+                                                               if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) {
+                                                                       tech_pvt->codec_ms = codec_ms;
+                                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Changing codec ptime to %d\n", tech_pvt->codec_ms);
+                                                                       switch_core_codec_destroy(&tech_pvt->read_codec);
+                                                                       switch_core_codec_destroy(&tech_pvt->write_codec);
+                                                                       if (sofia_glue_tech_set_codec(tech_pvt, 2) != SWITCH_STATUS_SUCCESS) {
+                                                                               *frame = NULL;
+                                                                               return SWITCH_STATUS_GENERR;
+                                                                       }
+
+                                                                       switch_rtp_change_interval(tech_pvt->rtp_session, 
+                                                                                                                          tech_pvt->read_codec.implementation->samples_per_packet,
+                                                                                                                          tech_pvt->codec_ms * 1000);
+                                                               }
+                                                       
+                                                       }
+                                                       tech_pvt->check_frames++;
+                                                       tech_pvt->last_ts = tech_pvt->read_frame.timestamp;
+                                               }
+                                       }
+                                       
+                                       
                                        if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet)) {
                                                frames = (tech_pvt->read_frame.datalen / bytes);
                                        }
index 6484959343c8873bfbdbf315cc03d6abb74a1853..8b4863cae085442120a479af49cd280c2e3bdff6 100644 (file)
@@ -505,6 +505,8 @@ struct private_object {
        int got_bye;
        int hold_laps;
        switch_thread_id_t locker;
+       switch_size_t last_ts;
+       uint32_t check_frames;
 };
 
 struct callback_t {
@@ -708,3 +710,4 @@ void sofia_reg_send_reboot(sofia_profile_t *profile, const char *user, const cha
 void sofia_glue_restart_all_profiles(void);
 void sofia_glue_toggle_hold(private_object_t *tech_pvt, int sendonly);
 const char * sofia_state_string(int state);
+switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force);
index 3fbd5bccaa89d182d1bfcff951671e5aeb634351..55eb949858c91d9f56246570123fbf1d11bf749a 100644 (file)
@@ -182,6 +182,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
        } else {
                switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=silenceSupp:off - - - -\n");
        }
+
        if (ptime) {
                switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime);
        }
@@ -1535,7 +1536,7 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
                        return SWITCH_STATUS_SUCCESS;
                }
        }
-
+       
        if (switch_core_codec_init(&tech_pvt->read_codec,
                                                           tech_pvt->iananame,
                                                           tech_pvt->rm_fmtp,
@@ -1576,8 +1577,11 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
        tech_pvt->write_codec.agreed_pt = tech_pvt->agreed_pt;
        tech_pvt->read_codec.agreed_pt = tech_pvt->agreed_pt;
 
-       switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
-       switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
+       if (force != 2) {
+               switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
+               switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
+       }
+
        tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out);
 
        if (switch_rtp_ready(tech_pvt->rtp_session)) {
index eed77d9db8229ae712c7a3007eefcf7f0cca16d7..193b40c05ada3f0f968a33a4c119d10b20cf42bf 100644 (file)
@@ -754,6 +754,22 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
        return SWITCH_STATUS_SUCCESS;
 }
 
+SWITCH_DECLARE(void) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval)
+{
+       rtp_session->ms_per_packet = ms_per_packet;
+       rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval;
+       
+       if (rtp_session->timer_name) {
+               if (rtp_session->timer.timer_interface) {
+                       switch_core_timer_destroy(&rtp_session->timer);
+               }
+               switch_core_timer_init(&rtp_session->timer, rtp_session->timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+                                                 "RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet);
+       }
+               
+}
+
 SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session,
                                                                                                  switch_payload_t payload,
                                                                                                  uint32_t samples_per_interval,
@@ -816,14 +832,14 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
        rtp_session->ms_per_packet = ms_per_packet;
        rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval;
 
-       if (timer_name && !strcasecmp(timer_name, "none")) {
-               timer_name = NULL;
-       }
-
        if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) && switch_strlen_zero(timer_name)) {
                timer_name = "soft";
        }
 
+       if (!switch_strlen_zero(timer_name) && !strcasecmp(timer_name, "none")) {
+               timer_name = NULL;
+       }
+
        if (!switch_strlen_zero(timer_name)) {
                rtp_session->timer_name = switch_core_strdup(pool, timer_name);
                switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
@@ -838,6 +854,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
                        switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
                }
        } else {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not using a timer\n");
                switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
                switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK);
        }
@@ -1260,6 +1277,10 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
        while (switch_rtp_ready(rtp_session)) {
                int do_cng = 0;
 
+               if (rtp_session->timer.interval) {
+                       switch_core_timer_next(&rtp_session->timer);
+               }
+
                bytes = sizeof(rtp_msg_t);
                status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes);
 
@@ -1268,6 +1289,8 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
                        goto end;
                }
                
+               check = !bytes;
+
                if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) {
                        switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK);
                        do_2833(rtp_session);
@@ -1319,36 +1342,22 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
                        rtp_session->missed_count = 0;
 
                        if (rtp_session->recv_msg.header.pt && (rtp_session->recv_msg.header.pt == rtp_session->cng_pt || rtp_session->recv_msg.header.pt == 13)) {
-                               if (++rtp_session->cng_count == 1) {
-                                       return_cng_frame();
-                               } 
-                               continue;
-                       } else {
-                               rtp_session->cng_count = 0;
-                       }
+                               return_cng_frame();
+                       } 
                }
 
                if (!bytes && (io_flags & SWITCH_IO_FLAG_NOBLOCK)) {
                        return_cng_frame();
                }
 
-
-               if (rtp_session->timer.interval) {
-                       check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS);
-                       if (bytes) {
-                               switch_core_timer_sync(&rtp_session->timer);
-                       } else {
-                               if (check && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) &&
-                                       rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) {
-                                       uint8_t data[10] = { 0 };
-                                       switch_frame_flag_t frame_flags = SFF_NONE;
-                                       data[0] = 65;
-                                       rtp_session->cn++;
-                                       rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags);
-                               }
-                       }
-               } else if (bytes) {
-                       check++;
+               
+               if (check && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) &&
+                       rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) {
+                       uint8_t data[10] = { 0 };
+                       switch_frame_flag_t frame_flags = SFF_NONE;
+                       data[0] = 65;
+                       rtp_session->cn++;
+                       rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags);
                }
 
                if (check || bytes) {
@@ -1527,8 +1536,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
                                bytes = jb_frame->dlen + rtp_header_len;
                                rtp_session->recv_msg.header.ts = htonl(jb_frame->ts);
                        } else if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) {        /* We're late! We're Late! */
-                               
-                               
                                if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) {
                                        switch_yield(1000);
                                        continue;
@@ -1556,7 +1563,9 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
          do_continue:
                
-               switch_yield(sleep_mss);
+               if (!bytes && !rtp_session->timer.interval) {
+                       switch_yield(sleep_mss);
+               }
 
        }
 
index 0a9d8a34fc9c3a5fbb1bea54a0f216e15e9ceec7..49ec36f41ede9f2459a55382b5131ebf851b4b51 100644 (file)
@@ -46,6 +46,7 @@ static switch_memory_pool_t *module_pool = NULL;
 static struct {
        int32_t RUNNING;
        int32_t STARTED;
+       int32_t use_cond_yield;
        switch_mutex_t *mutex;
 } globals;
 
@@ -76,6 +77,8 @@ struct timer_matrix {
        switch_size_t tick;
        uint32_t count;
        uint32_t roll;
+       switch_mutex_t *mutex;
+       switch_thread_cond_t *cond;
 };
 typedef struct timer_matrix timer_matrix_t;
 
@@ -103,6 +106,25 @@ static int MONO = 0;
 #endif
 
 
+static void do_yield(switch_interval_time_t t)
+{
+#if defined(HAVE_CLOCK_NANOSLEEP) && defined(SWITCH_USE_CLOCK_FUNCS)
+    struct timespec ts;
+    ts.tv_sec = t / APR_USEC_PER_SEC;
+    ts.tv_nsec = (t % APR_USEC_PER_SEC) * 1000;
+
+    clock_nanosleep(CLOCK_REALTIME, 0, &ts, NULL);
+
+#elif defined(HAVE_USLEEP)
+    usleep(t);
+#elif defined(WIN32)
+    Sleep((DWORD) ((t) / 1000));
+#else
+    apr_sleep(t);
+#endif
+
+}
+
 SWITCH_DECLARE(void) switch_time_set_monotonic(switch_bool_t enable)
 {
        MONO = enable ? 1 : 0;
@@ -139,6 +161,11 @@ SWITCH_DECLARE(void) switch_time_sync(void)
 SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 {
 
+       if (globals.use_cond_yield == 1) {
+               switch_cond_yield((t) / 1000);
+               return;
+       }
+
 #if defined(HAVE_USLEEP)
        usleep(t);
 #elif defined(WIN32)
@@ -166,13 +193,29 @@ SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 
 }
 
+
+SWITCH_DECLARE(void) switch_cond_yield(uint32_t ms)
+{
+       if (!ms) return;
+
+       if (globals.use_cond_yield != 1) {
+               do_yield(ms * 1000);
+       }
+
+       while(globals.RUNNING == 1 && globals.use_cond_yield == 1 && ms--) {
+               switch_mutex_lock(TIMER_MATRIX[1].mutex);
+               switch_thread_cond_wait(TIMER_MATRIX[1].cond, TIMER_MATRIX[1].mutex);
+               switch_mutex_unlock(TIMER_MATRIX[1].mutex);
+       }
+}
+
 static switch_status_t timer_init(switch_timer_t *timer)
 {
        timer_private_t *private_info;
        int sanity = 0;
 
        while (globals.STARTED == 0) {
-               switch_yield(100000);
+               do_yield(100000);
                if (++sanity == 10) {
                        break;
                }
@@ -187,6 +230,10 @@ static switch_status_t timer_init(switch_timer_t *timer)
                timeBeginPeriod(1);
 #endif
                switch_mutex_lock(globals.mutex);
+               if (!TIMER_MATRIX[timer->interval].mutex) {
+                       switch_mutex_init(&TIMER_MATRIX[timer->interval].mutex, SWITCH_MUTEX_NESTED, module_pool);
+                       switch_thread_cond_create(&TIMER_MATRIX[timer->interval].cond, module_pool);
+               }
                TIMER_MATRIX[timer->interval].count++;
                switch_mutex_unlock(globals.mutex);
                timer->private_info = private_info;
@@ -252,13 +299,21 @@ static switch_status_t timer_sync(switch_timer_t *timer)
 static switch_status_t timer_next(switch_timer_t *timer)
 {
        timer_private_t *private_info = timer->private_info;
-
        timer_step(timer);
 
+#if 1
        while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) {
                check_roll();
-               switch_yield(1000);
+               switch_mutex_lock(TIMER_MATRIX[timer->interval].mutex);
+               switch_thread_cond_wait(TIMER_MATRIX[timer->interval].cond, TIMER_MATRIX[timer->interval].mutex);
+               switch_mutex_unlock(TIMER_MATRIX[timer->interval].mutex);
        }
+#else
+       while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) {
+               check_roll();
+               do_yield(1000);
+       }
+#endif
 
        if (globals.RUNNING == 1) {
                return SWITCH_STATUS_SUCCESS;
@@ -340,7 +395,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                                runtime.initiated = runtime.reference;
                                break;
                        }
-                       switch_yield(STEP_MIC);
+                       do_yield(STEP_MIC);
                        last = ts;
                }
        }
@@ -349,8 +404,15 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
        last = 0;
        fwd_errs = rev_errs = 0;
 
+
+       switch_mutex_init(&TIMER_MATRIX[1].mutex, SWITCH_MUTEX_NESTED, module_pool);
+       switch_thread_cond_create(&TIMER_MATRIX[1].cond, module_pool);
+       
+       globals.use_cond_yield = globals.RUNNING == 1;
+       
        while (globals.RUNNING == 1) {
                runtime.reference += STEP_MIC;
+
                while ((ts = time_now(runtime.offset)) < runtime.reference) {
                        if (ts < last) {
                                if (MONO) {
@@ -368,7 +430,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                        } else {
                                rev_errs = 0;
                        }
-                       switch_yield(STEP_MIC);
+                       do_yield(STEP_MIC);
                        last = ts;
                }
 
@@ -413,11 +475,28 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                        tick = 0;
                }
 
+               TIMER_MATRIX[1].tick++;
+               if (switch_mutex_trylock(TIMER_MATRIX[1].mutex) == SWITCH_STATUS_SUCCESS) {
+                       switch_thread_cond_broadcast(TIMER_MATRIX[1].cond);
+                       switch_mutex_unlock(TIMER_MATRIX[1].mutex);
+               }
+               if (TIMER_MATRIX[1].tick == MAX_TICK) {
+                       TIMER_MATRIX[1].tick = 0;
+                       TIMER_MATRIX[1].roll++;
+               }
+
+
                if ((current_ms % MS_PER_TICK) == 0) {
                        for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) {
                                if ((current_ms % x) == 0) {
                                        if (TIMER_MATRIX[x].count) {
                                                TIMER_MATRIX[x].tick++;
+#if 1
+                                               if (TIMER_MATRIX[x].mutex && switch_mutex_trylock(TIMER_MATRIX[x].mutex) == SWITCH_STATUS_SUCCESS) {
+                                                       switch_thread_cond_broadcast(TIMER_MATRIX[x].cond);
+                                                       switch_mutex_unlock(TIMER_MATRIX[x].mutex);
+                                               }
+#endif
                                                if (TIMER_MATRIX[x].tick == MAX_TICK) {
                                                        TIMER_MATRIX[x].tick = 0;
                                                        TIMER_MATRIX[x].roll++;
@@ -431,10 +510,22 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                }
        }
 
+       globals.use_cond_yield = 0;
+       
+       for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) {
+               if (TIMER_MATRIX[x].mutex && switch_mutex_trylock(TIMER_MATRIX[x].mutex) == SWITCH_STATUS_SUCCESS) {
+                       switch_thread_cond_broadcast(TIMER_MATRIX[x].cond);
+                       switch_mutex_unlock(TIMER_MATRIX[x].mutex);
+               }
+       }
+
+
        switch_mutex_lock(globals.mutex);
        globals.RUNNING = 0;
        switch_mutex_unlock(globals.mutex);
 
+       
+
        return SWITCH_STATUS_TERM;
 }
 
@@ -641,14 +732,13 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
 {
-
-       if (globals.RUNNING) {
+       if (globals.RUNNING == 1) {
                switch_mutex_lock(globals.mutex);
                globals.RUNNING = -1;
                switch_mutex_unlock(globals.mutex);
 
-               while (globals.RUNNING) {
-                       switch_yield(10000);
+               while (globals.RUNNING == -1) {
+                       do_yield(10000);
                }
        }
 #if defined(WIN32)