Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
a44e6c08
提交
a44e6c08
authored
4月 26, 2010
作者:
Michael Jerris
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add terminte-on-silence conference param
上级
2ae67a47
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
29 行增加
和
0 行删除
+29
-0
mod_conference.c
src/mod/applications/mod_conference/mod_conference.c
+29
-0
没有找到文件。
src/mod/applications/mod_conference/mod_conference.c
浏览文件 @
a44e6c08
...
@@ -262,6 +262,7 @@ typedef struct conference_obj {
...
@@ -262,6 +262,7 @@ typedef struct conference_obj {
char
*
sound_prefix
;
char
*
sound_prefix
;
char
*
special_announce
;
char
*
special_announce
;
char
*
auto_record
;
char
*
auto_record
;
uint32_t
terminate_on_silence
;
uint32_t
max_members
;
uint32_t
max_members
;
char
*
maxmember_sound
;
char
*
maxmember_sound
;
uint32_t
announce_count
;
uint32_t
announce_count
;
...
@@ -336,6 +337,7 @@ struct conference_member {
...
@@ -336,6 +337,7 @@ struct conference_member {
int32_t
energy_level
;
int32_t
energy_level
;
int32_t
volume_in_level
;
int32_t
volume_in_level
;
int32_t
volume_out_level
;
int32_t
volume_out_level
;
switch_time_t
join_time
;
switch_time_t
last_talking
;
switch_time_t
last_talking
;
uint32_t
native_rate
;
uint32_t
native_rate
;
switch_audio_resampler_t
*
read_resampler
;
switch_audio_resampler_t
*
read_resampler
;
...
@@ -639,6 +641,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
...
@@ -639,6 +641,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
switch_mutex_lock
(
conference
->
member_mutex
);
switch_mutex_lock
(
conference
->
member_mutex
);
switch_clear_flag
(
conference
,
CFLAG_DESTRUCT
);
switch_clear_flag
(
conference
,
CFLAG_DESTRUCT
);
member
->
join_time
=
switch_epoch_time_now
(
NULL
);
member
->
conference
=
conference
;
member
->
conference
=
conference
;
member
->
next
=
conference
->
members
;
member
->
next
=
conference
->
members
;
member
->
energy_level
=
conference
->
energy_level
;
member
->
energy_level
=
conference
->
energy_level
;
...
@@ -1046,6 +1049,23 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
...
@@ -1046,6 +1049,23 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
switch_mutex_unlock
(
imember
->
audio_in_mutex
);
switch_mutex_unlock
(
imember
->
audio_in_mutex
);
}
}
/* Find if no one talked for more than x number of second */
if
(
conference
->
terminate_on_silence
&&
conference
->
count
>
1
)
{
int
is_talking
=
0
;
for
(
imember
=
conference
->
members
;
imember
;
imember
=
imember
->
next
)
{
if
(
switch_epoch_time_now
(
NULL
)
-
imember
->
join_time
<=
conference
->
terminate_on_silence
)
{
is_talking
++
;
}
else
if
(
imember
->
last_talking
!=
0
&&
switch_epoch_time_now
(
NULL
)
-
imember
->
last_talking
<=
conference
->
terminate_on_silence
)
{
is_talking
++
;
}
}
if
(
is_talking
==
0
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_DEBUG
,
"Conference has been idle for over %d seconds, terminating
\n
"
,
conference
->
terminate_on_silence
);
switch_set_flag
(
conference
,
CFLAG_DESTRUCT
);
}
}
/* Start recording if there's more than one participant. */
/* Start recording if there's more than one participant. */
if
(
conference
->
auto_record
&&
!
conference
->
is_recording
&&
conference
->
count
>
1
)
{
if
(
conference
->
auto_record
&&
!
conference
->
is_recording
&&
conference
->
count
>
1
)
{
conference
->
is_recording
=
1
;
conference
->
is_recording
=
1
;
...
@@ -3618,6 +3638,9 @@ static void conference_xlist(conference_obj_t *conference, switch_xml_t x_confer
...
@@ -3618,6 +3638,9 @@ static void conference_xlist(conference_obj_t *conference, switch_xml_t x_confer
add_x_tag
(
x_member
,
"caller_id_number"
,
profile
->
caller_id_number
,
toff
++
);
add_x_tag
(
x_member
,
"caller_id_number"
,
profile
->
caller_id_number
,
toff
++
);
switch_snprintf
(
i
,
sizeof
(
i
),
"%d"
,
switch_epoch_time_now
(
NULL
)
-
member
->
join_time
);
add_x_tag
(
x_member
,
"join_time"
,
i
,
toff
++
);
switch_snprintf
(
i
,
sizeof
(
i
),
"%d"
,
switch_epoch_time_now
(
NULL
)
-
member
->
last_talking
);
switch_snprintf
(
i
,
sizeof
(
i
),
"%d"
,
switch_epoch_time_now
(
NULL
)
-
member
->
last_talking
);
add_x_tag
(
x_member
,
"last_talking"
,
member
->
last_talking
?
i
:
"N/A"
,
toff
++
);
add_x_tag
(
x_member
,
"last_talking"
,
member
->
last_talking
?
i
:
"N/A"
,
toff
++
);
...
@@ -5798,6 +5821,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
...
@@ -5798,6 +5821,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
char
*
suppress_events
=
NULL
;
char
*
suppress_events
=
NULL
;
char
*
verbose_events
=
NULL
;
char
*
verbose_events
=
NULL
;
char
*
auto_record
=
NULL
;
char
*
auto_record
=
NULL
;
char
*
terminate_on_silence
=
NULL
;
/* Validate the conference name */
/* Validate the conference name */
if
(
zstr
(
name
))
{
if
(
zstr
(
name
))
{
...
@@ -5927,6 +5951,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
...
@@ -5927,6 +5951,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
verbose_events
=
val
;
verbose_events
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"auto-record"
)
&&
!
zstr
(
val
))
{
}
else
if
(
!
strcasecmp
(
var
,
"auto-record"
)
&&
!
zstr
(
val
))
{
auto_record
=
val
;
auto_record
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"terminate-on-silence"
)
&&
!
zstr
(
val
))
{
terminate_on_silence
=
val
;
}
}
}
}
...
@@ -6098,6 +6124,9 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
...
@@ -6098,6 +6124,9 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
if
(
!
zstr
(
auto_record
))
{
if
(
!
zstr
(
auto_record
))
{
conference
->
auto_record
=
switch_core_strdup
(
conference
->
pool
,
auto_record
);
conference
->
auto_record
=
switch_core_strdup
(
conference
->
pool
,
auto_record
);
}
}
if
(
!
zstr
(
terminate_on_silence
))
{
conference
->
terminate_on_silence
=
atoi
(
terminate_on_silence
);
}
if
(
!
zstr
(
verbose_events
)
&&
switch_true
(
verbose_events
))
{
if
(
!
zstr
(
verbose_events
)
&&
switch_true
(
verbose_events
))
{
conference
->
verbose_events
=
1
;
conference
->
verbose_events
=
1
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论