retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

make conf use default profile if none specified, make it work with soundfiles on windows, must have full drive letter and path (i.e. C:\Windows\Media\blah.wav) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2499 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-09-04 03:36:56 +00:00
parent 19f860e274
commit 19a820229f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1017,7 +1017,11 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
return SWITCH_STATUS_FALSE;
}
#ifdef WIN32
if (file[1] != ':') {
#else
if (*file != '/') {
#endif
return conference_say(conference, file, leadin);
}
@ -2173,19 +2177,23 @@ static void conference_function(switch_core_session_t *session, char *data)
*dpin++ = '\0';
}
/* Open the config from the xml registry */
if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
goto done;
}
if ((profile_name = strchr(conf_name, '@'))) {
*profile_name++ = '\0';
/* Open the config from the xml registry */
if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
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"))) {
profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
}
}
} else {
if ((profiles = switch_xml_child(cfg, "profiles"))) {
profile = switch_xml_find_child(profiles, "profile", "name", "default");
}
}
if (isbr) {
char *uuid = switch_core_session_get_uuid(session);