Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
aa0119ef
提交
aa0119ef
authored
3月 06, 2018
作者:
Dragos Oancea
提交者:
Dragos Oancea
3月 06, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11007: [mod_conference] fix recording counter and remove unused code
上级
d19e3bb3
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
3 行增加
和
7 行删除
+3
-7
conference_record.c
src/mod/applications/mod_conference/conference_record.c
+3
-7
没有找到文件。
src/mod/applications/mod_conference/conference_record.c
浏览文件 @
aa0119ef
...
@@ -91,7 +91,6 @@ switch_status_t conference_record_stop(conference_obj_t *conference, switch_stre
...
@@ -91,7 +91,6 @@ switch_status_t conference_record_stop(conference_obj_t *conference, switch_stre
switch_mutex_lock
(
conference
->
member_mutex
);
switch_mutex_lock
(
conference
->
member_mutex
);
for
(
member
=
conference
->
members
;
member
;
member
=
member
->
next
)
{
for
(
member
=
conference
->
members
;
member
;
member
=
member
->
next
)
{
if
(
conference_utils_member_test_flag
(
member
,
MFLAG_NOCHANNEL
)
&&
(
!
path
||
!
strcmp
(
path
,
member
->
rec_path
)))
{
if
(
conference_utils_member_test_flag
(
member
,
MFLAG_NOCHANNEL
)
&&
(
!
path
||
!
strcmp
(
path
,
member
->
rec_path
)))
{
conference
->
record_count
--
;
if
(
!
conference_utils_test_flag
(
conference
,
CFLAG_CONF_RESTART_AUTO_RECORD
)
&&
member
->
rec
&&
member
->
rec
->
autorec
)
{
if
(
!
conference_utils_test_flag
(
conference
,
CFLAG_CONF_RESTART_AUTO_RECORD
)
&&
member
->
rec
&&
member
->
rec
->
autorec
)
{
stream
->
write_function
(
stream
,
"Stopped AUTO recording file %s (Auto Recording Now Disabled)
\n
"
,
member
->
rec_path
);
stream
->
write_function
(
stream
,
"Stopped AUTO recording file %s (Auto Recording Now Disabled)
\n
"
,
member
->
rec_path
);
conference
->
auto_record
=
0
;
conference
->
auto_record
=
0
;
...
@@ -155,7 +154,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
...
@@ -155,7 +154,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
{
{
int16_t
*
data_buf
;
int16_t
*
data_buf
;
conference_member_t
smember
=
{
0
},
*
member
;
conference_member_t
smember
=
{
0
},
*
member
;
conference_record_t
*
rp
,
*
last
=
NULL
,
*
rec
=
(
conference_record_t
*
)
obj
;
conference_record_t
*
rp
,
*
rec
=
(
conference_record_t
*
)
obj
;
conference_obj_t
*
conference
=
rec
->
conference
;
conference_obj_t
*
conference
=
rec
->
conference
;
uint32_t
samples
=
switch_samples_per_packet
(
conference
->
rate
,
conference
->
interval
);
uint32_t
samples
=
switch_samples_per_packet
(
conference
->
rate
,
conference
->
interval
);
uint32_t
mux_used
;
uint32_t
mux_used
;
...
@@ -422,6 +421,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
...
@@ -422,6 +421,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
switch_core_file_close
(
&
member
->
rec
->
fh
);
switch_core_file_close
(
&
member
->
rec
->
fh
);
}
}
conference
->
record_count
--
;
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"Recording of %s Stopped
\n
"
,
rec
->
path
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"Recording of %s Stopped
\n
"
,
rec
->
path
);
if
(
switch_event_create_subclass
(
&
event
,
SWITCH_EVENT_CUSTOM
,
CONF_EVENT_MAINT
)
==
SWITCH_STATUS_SUCCESS
)
{
if
(
switch_event_create_subclass
(
&
event
,
SWITCH_EVENT_CUSTOM
,
CONF_EVENT_MAINT
)
==
SWITCH_STATUS_SUCCESS
)
{
...
@@ -455,11 +455,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
...
@@ -455,11 +455,7 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
switch_mutex_lock
(
conference
->
flag_mutex
);
switch_mutex_lock
(
conference
->
flag_mutex
);
for
(
rp
=
conference
->
rec_node_head
;
rp
;
rp
=
rp
->
next
)
{
for
(
rp
=
conference
->
rec_node_head
;
rp
;
rp
=
rp
->
next
)
{
if
(
rec
==
rp
)
{
if
(
rec
==
rp
)
{
if
(
last
)
{
conference
->
rec_node_head
=
rp
->
next
;
last
->
next
=
rp
->
next
;
}
else
{
conference
->
rec_node_head
=
rp
->
next
;
}
}
}
}
}
switch_mutex_unlock
(
conference
->
flag_mutex
);
switch_mutex_unlock
(
conference
->
flag_mutex
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论