提交 19a82022 authored 作者: Michael Jerris's avatar Michael Jerris

make conf use default profile if none specified, make it work with soundfiles on…

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
上级 19f860e2
...@@ -1017,7 +1017,11 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char * ...@@ -1017,7 +1017,11 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
#ifdef WIN32
if (file[1] != ':') {
#else
if (*file != '/') { if (*file != '/') {
#endif
return conference_say(conference, file, leadin); return conference_say(conference, file, leadin);
} }
...@@ -2173,19 +2177,23 @@ static void conference_function(switch_core_session_t *session, char *data) ...@@ -2173,19 +2177,23 @@ static void conference_function(switch_core_session_t *session, char *data)
*dpin++ = '\0'; *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, '@'))) { if ((profile_name = strchr(conf_name, '@'))) {
*profile_name++ = '\0'; *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"))) { if ((profiles = switch_xml_child(cfg, "profiles"))) {
profile = switch_xml_find_child(profiles, "profile", "name", profile_name); 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) { if (isbr) {
char *uuid = switch_core_session_get_uuid(session); char *uuid = switch_core_session_get_uuid(session);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论