Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
6ac81059
提交
6ac81059
authored
1月 09, 2019
作者:
Mariah Yang
提交者:
Chris Rienzo
1月 09, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11601: Fix some core function prototype
上级
0629f95c
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
17 行增加
和
17 行删除
+17
-17
switch_core.h
src/include/switch_core.h
+1
-1
switch_ivr.h
src/include/switch_ivr.h
+3
-3
switch_loadable_module.h
src/include/switch_loadable_module.h
+1
-1
switch_core_speech.c
src/switch_core_speech.c
+1
-1
switch_ivr_async.c
src/switch_ivr_async.c
+1
-1
switch_ivr_play_say.c
src/switch_ivr_play_say.c
+4
-4
switch_loadable_module.c
src/switch_loadable_module.c
+6
-6
没有找到文件。
src/include/switch_core.h
浏览文件 @
6ac81059
...
...
@@ -1992,7 +1992,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(_In_ switch_speech_handl
\param flags flags in/out for fine tuning
\return SWITCH_STATUS_SUCCESS with len adjusted to the bytes written if successful
*/
SWITCH_DECLARE
(
switch_status_t
)
switch_core_speech_feed_tts
(
switch_speech_handle_t
*
sh
,
char
*
text
,
switch_speech_flag_t
*
flags
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_speech_feed_tts
(
switch_speech_handle_t
*
sh
,
c
onst
c
har
*
text
,
switch_speech_flag_t
*
flags
);
/*!
\brief Flush TTS audio on a given handle
...
...
src/include/switch_ivr.h
浏览文件 @
6ac81059
...
...
@@ -292,7 +292,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_start_input_timers(swit
\param fh file handle to use (NULL for builtin one)
\return SWITCH_STATUS_SUCCESS if all is well
*/
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_record_session
(
switch_core_session_t
*
session
,
char
*
file
,
uint32_t
limit
,
switch_file_handle_t
*
fh
);
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_record_session
(
switch_core_session_t
*
session
,
c
onst
c
har
*
file
,
uint32_t
limit
,
switch_file_handle_t
*
fh
);
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_transfer_recordings
(
switch_core_session_t
*
orig_session
,
switch_core_session_t
*
new_session
);
...
...
@@ -471,7 +471,7 @@ SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_speak_text_handle
(
switch_core_session_t
*
session
,
switch_speech_handle_t
*
sh
,
switch_codec_t
*
codec
,
switch_timer_t
*
timer
,
char
*
text
,
switch_input_args_t
*
args
);
switch_codec_t
*
codec
,
switch_timer_t
*
timer
,
c
onst
c
har
*
text
,
switch_input_args_t
*
args
);
SWITCH_DECLARE
(
void
)
switch_ivr_clear_speech_cache
(
switch_core_session_t
*
session
);
/*!
\brief Speak given text with given tts engine
...
...
@@ -483,7 +483,7 @@ SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *sessio
\return SWITCH_STATUS_SUCCESS if all is well
*/
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_speak_text
(
switch_core_session_t
*
session
,
const
char
*
tts_name
,
const
char
*
voice_name
,
char
*
text
,
switch_input_args_t
*
args
);
const
char
*
tts_name
,
const
char
*
voice_name
,
c
onst
c
har
*
text
,
switch_input_args_t
*
args
);
/*!
\brief Make an outgoing call
...
...
src/include/switch_loadable_module.h
浏览文件 @
6ac81059
...
...
@@ -302,7 +302,7 @@ SWITCH_DECLARE(switch_status_t) switch_json_api_execute(cJSON *json, switch_core
\param err pointer to error message
\return the status
*/
SWITCH_DECLARE
(
switch_status_t
)
switch_loadable_module_load_module
(
c
har
*
dir
,
char
*
fname
,
switch_bool_t
runtime
,
const
char
**
err
);
SWITCH_DECLARE
(
switch_status_t
)
switch_loadable_module_load_module
(
c
onst
char
*
dir
,
const
char
*
fname
,
switch_bool_t
runtime
,
const
char
**
err
);
/*!
\brief Check if a module is loaded
...
...
src/switch_core_speech.c
浏览文件 @
6ac81059
...
...
@@ -96,7 +96,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *
return
status
;
}
SWITCH_DECLARE
(
switch_status_t
)
switch_core_speech_feed_tts
(
switch_speech_handle_t
*
sh
,
char
*
text
,
switch_speech_flag_t
*
flags
)
SWITCH_DECLARE
(
switch_status_t
)
switch_core_speech_feed_tts
(
switch_speech_handle_t
*
sh
,
c
onst
c
har
*
text
,
switch_speech_flag_t
*
flags
)
{
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
char
*
param_string
=
NULL
;
...
...
src/switch_ivr_async.c
浏览文件 @
6ac81059
...
...
@@ -2538,7 +2538,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
return
status
;
}
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_record_session
(
switch_core_session_t
*
session
,
char
*
file
,
uint32_t
limit
,
switch_file_handle_t
*
fh
)
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_record_session
(
switch_core_session_t
*
session
,
c
onst
c
har
*
file
,
uint32_t
limit
,
switch_file_handle_t
*
fh
)
{
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
const
char
*
p
;
...
...
src/switch_ivr_play_say.c
浏览文件 @
6ac81059
...
...
@@ -2644,7 +2644,7 @@ SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_speak_text_handle
(
switch_core_session_t
*
session
,
switch_speech_handle_t
*
sh
,
switch_codec_t
*
codec
,
switch_timer_t
*
timer
,
char
*
text
,
switch_input_args_t
*
args
)
switch_codec_t
*
codec
,
switch_timer_t
*
timer
,
c
onst
c
har
*
text
,
switch_input_args_t
*
args
)
{
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
short
abuf
[
SWITCH_RECOMMENDED_BUFFER_SIZE
];
...
...
@@ -2656,8 +2656,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
switch_speech_flag_t
flags
=
SWITCH_SPEECH_FLAG_NONE
;
switch_size_t
extra
=
0
;
char
*
p
,
*
tmp
=
NULL
;
const
char
*
star
,
*
pound
;
char
*
tmp
=
NULL
;
const
char
*
star
,
*
pound
,
*
p
;
switch_size_t
starlen
,
poundlen
;
if
(
!
sh
)
{
...
...
@@ -2940,7 +2940,7 @@ SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *sessio
}
SWITCH_DECLARE
(
switch_status_t
)
switch_ivr_speak_text
(
switch_core_session_t
*
session
,
const
char
*
tts_name
,
const
char
*
voice_name
,
char
*
text
,
switch_input_args_t
*
args
)
const
char
*
tts_name
,
const
char
*
voice_name
,
c
onst
c
har
*
text
,
switch_input_args_t
*
args
)
{
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
uint32_t
rate
=
0
;
...
...
src/switch_loadable_module.c
浏览文件 @
6ac81059
...
...
@@ -95,7 +95,7 @@ struct switch_loadable_module_container {
static
struct
switch_loadable_module_container
loadable_modules
;
static
switch_status_t
do_shutdown
(
switch_loadable_module_t
*
module
,
switch_bool_t
shutdown
,
switch_bool_t
unload
,
switch_bool_t
fail_if_busy
,
const
char
**
err
);
static
switch_status_t
switch_loadable_module_load_module_ex
(
c
har
*
dir
,
char
*
fname
,
switch_bool_t
runtime
,
switch_bool_t
global
,
const
char
**
err
);
static
switch_status_t
switch_loadable_module_load_module_ex
(
c
onst
char
*
dir
,
const
char
*
fname
,
switch_bool_t
runtime
,
switch_bool_t
global
,
const
char
**
err
);
static
void
*
SWITCH_THREAD_FUNC
switch_loadable_module_exec
(
switch_thread_t
*
thread
,
void
*
obj
)
{
...
...
@@ -1544,12 +1544,12 @@ static switch_status_t switch_loadable_module_load_file(char *path, char *filena
return
SWITCH_STATUS_SUCCESS
;
}
SWITCH_DECLARE
(
switch_status_t
)
switch_loadable_module_load_module
(
c
har
*
dir
,
char
*
fname
,
switch_bool_t
runtime
,
const
char
**
err
)
SWITCH_DECLARE
(
switch_status_t
)
switch_loadable_module_load_module
(
c
onst
char
*
dir
,
const
char
*
fname
,
switch_bool_t
runtime
,
const
char
**
err
)
{
return
switch_loadable_module_load_module_ex
(
dir
,
fname
,
runtime
,
SWITCH_FALSE
,
err
);
}
static
switch_status_t
switch_loadable_module_load_module_ex
(
c
har
*
dir
,
char
*
fname
,
switch_bool_t
runtime
,
switch_bool_t
global
,
const
char
**
err
)
static
switch_status_t
switch_loadable_module_load_module_ex
(
c
onst
char
*
dir
,
const
char
*
fname
,
switch_bool_t
runtime
,
switch_bool_t
global
,
const
char
**
err
)
{
switch_size_t
len
=
0
;
char
*
path
;
...
...
@@ -1902,7 +1902,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
if
(
path
&&
zstr
(
path
))
{
path
=
SWITCH_GLOBAL_dirs
.
mod_dir
;
}
if
(
switch_loadable_module_load_module_ex
(
(
char
*
)
path
,
(
char
*
)
val
,
SWITCH_FALSE
,
global
,
&
err
)
==
SWITCH_STATUS_GENERR
)
{
if
(
switch_loadable_module_load_module_ex
(
path
,
val
,
SWITCH_FALSE
,
global
,
&
err
)
==
SWITCH_STATUS_GENERR
)
{
if
(
critical
&&
switch_true
(
critical
))
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_CRIT
,
"Failed to load critical module '%s', abort()
\n
"
,
val
);
abort
();
...
...
@@ -1935,7 +1935,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
if
(
path
&&
zstr
(
path
))
{
path
=
SWITCH_GLOBAL_dirs
.
mod_dir
;
}
switch_loadable_module_load_module_ex
(
(
char
*
)
path
,
(
char
*
)
val
,
SWITCH_FALSE
,
global
,
&
err
);
switch_loadable_module_load_module_ex
(
path
,
val
,
SWITCH_FALSE
,
global
,
&
err
);
count
++
;
}
}
...
...
@@ -1975,7 +1975,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
continue
;
}
switch_loadable_module_load_module
(
(
char
*
)
SWITCH_GLOBAL_dirs
.
mod_dir
,
(
char
*
)
fname
,
SWITCH_FALSE
,
&
err
);
switch_loadable_module_load_module
(
SWITCH_GLOBAL_dirs
.
mod_dir
,
fname
,
SWITCH_FALSE
,
&
err
);
}
apr_dir_close
(
module_dir_handle
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论