kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-06 02:22:56 +00:00
Code Issues Projects Releases Wiki Activity

smaller func name so it prints nicer

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3787 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-12-21 20:52:19 +00:00
parent a8cf41acde
commit c539bab153
2 changed files with 5280 additions and 8136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12815
libs/libsndfile/configure vendored
View File

File diff suppressed because it is too large Load Diff

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2978,8 +2978,6 @@ static switch_status_t conf_api_sub_norecord(conference_obj_t *conference, switc
return ret_status; return ret_status;
} }
/* API Interface Function sub-commands */ /* API Interface Function sub-commands */
static api_command_t conf_api_sub_commands[] = { static api_command_t conf_api_sub_commands[] = {
{"list", &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, {"list", &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"},
@ -3006,7 +3004,6 @@ static api_command_t conf_api_sub_commands[] = {
#define CONFFUNCAPISIZE (sizeof(conf_api_sub_commands)/sizeof(conf_api_sub_commands[0])) #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 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; switch_status_t status = SWITCH_STATUS_FALSE;
@ -3996,7 +3993,7 @@ static switch_status_t conference_caller_control_menu_build(caller_control_menu_
} }
#endif #endif
static switch_status_t conference_new_install_caller_controls_default(conference_obj_t *conference) static switch_status_t conf_default_controls(conference_obj_t *conference)
{ {
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
uint32_t i; uint32_t i;
@ -4334,7 +4331,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
/* if no controls, or default controls specified, install default */ /* if no controls, or default controls specified, install default */
if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) { if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) {
status = conference_new_install_caller_controls_default(conference); status = conf_default_controls(conference);
} else if (strcasecmp(caller_controls, "none") != 0) { } else if (strcasecmp(caller_controls, "none") != 0) {
/* try to build caller control if the group has been specified and != "none" */ /* 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); switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls);