Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
1c00e64a
提交
1c00e64a
authored
9月 19, 2016
作者:
Luis Azedo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-9533 [mod_conference] add member-enter-sound
上级
2bd7cfdf
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
12 行增加
和
0 行删除
+12
-0
mod_conference.c
src/mod/applications/mod_conference/mod_conference.c
+11
-0
mod_conference.h
src/mod/applications/mod_conference/mod_conference.h
+1
-0
没有找到文件。
src/mod/applications/mod_conference/mod_conference.c
浏览文件 @
1c00e64a
...
@@ -2087,6 +2087,10 @@ SWITCH_STANDARD_APP(conference_function)
...
@@ -2087,6 +2087,10 @@ SWITCH_STANDARD_APP(conference_function)
goto
done
;
goto
done
;
}
}
if
(
conference
->
member_enter_sound
&&
!
switch_channel_test_app_flag_key
(
"conference_silent"
,
channel
,
CONF_SILENT_REQ
))
{
conference_file_local_play
(
conference
,
session
,
conference
->
member_enter_sound
,
CONF_DEFAULT_LEADIN
,
NULL
,
0
);
}
}
}
/* Release the config registry handle */
/* Release the config registry handle */
...
@@ -2362,6 +2366,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
...
@@ -2362,6 +2366,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
char
*
name_domain
=
NULL
;
char
*
name_domain
=
NULL
;
char
*
tts_engine
=
NULL
;
char
*
tts_engine
=
NULL
;
char
*
tts_voice
=
NULL
;
char
*
tts_voice
=
NULL
;
char
*
member_enter_sound
=
NULL
;
char
*
enter_sound
=
NULL
;
char
*
enter_sound
=
NULL
;
char
*
sound_prefix
=
NULL
;
char
*
sound_prefix
=
NULL
;
char
*
exit_sound
=
NULL
;
char
*
exit_sound
=
NULL
;
...
@@ -2557,6 +2562,8 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
...
@@ -2557,6 +2562,8 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
tts_engine
=
val
;
tts_engine
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"tts-voice"
)
&&
!
zstr
(
val
))
{
}
else
if
(
!
strcasecmp
(
var
,
"tts-voice"
)
&&
!
zstr
(
val
))
{
tts_voice
=
val
;
tts_voice
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"member-enter-sound"
)
&&
!
zstr
(
val
))
{
member_enter_sound
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"enter-sound"
)
&&
!
zstr
(
val
))
{
}
else
if
(
!
strcasecmp
(
var
,
"enter-sound"
)
&&
!
zstr
(
val
))
{
enter_sound
=
val
;
enter_sound
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"outcall-templ"
)
&&
!
zstr
(
val
))
{
}
else
if
(
!
strcasecmp
(
var
,
"outcall-templ"
)
&&
!
zstr
(
val
))
{
...
@@ -3029,6 +3036,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
...
@@ -3029,6 +3036,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
conference
->
enter_sound
=
switch_core_strdup
(
conference
->
pool
,
enter_sound
);
conference
->
enter_sound
=
switch_core_strdup
(
conference
->
pool
,
enter_sound
);
}
}
if
(
!
zstr
(
member_enter_sound
))
{
conference
->
member_enter_sound
=
switch_core_strdup
(
conference
->
pool
,
member_enter_sound
);
}
if
(
!
zstr
(
exit_sound
))
{
if
(
!
zstr
(
exit_sound
))
{
conference
->
exit_sound
=
switch_core_strdup
(
conference
->
pool
,
exit_sound
);
conference
->
exit_sound
=
switch_core_strdup
(
conference
->
pool
,
exit_sound
);
}
}
...
...
src/mod/applications/mod_conference/mod_conference.h
浏览文件 @
1c00e64a
...
@@ -536,6 +536,7 @@ typedef struct conference_obj {
...
@@ -536,6 +536,7 @@ typedef struct conference_obj {
char
*
timer_name
;
char
*
timer_name
;
char
*
tts_engine
;
char
*
tts_engine
;
char
*
tts_voice
;
char
*
tts_voice
;
char
*
member_enter_sound
;
char
*
enter_sound
;
char
*
enter_sound
;
char
*
exit_sound
;
char
*
exit_sound
;
char
*
alone_sound
;
char
*
alone_sound
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论