Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
d17ee208
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d17ee208
编写于
2月 18, 2019
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
obs-frontend-api: Make a few frontend API thread-safe
Additionally, check for null output handlers.
上级
9cf40e23
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
43 addition
and
3 deletion
+43
-3
UI/api-interface.cpp
UI/api-interface.cpp
+18
-3
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+21
-0
UI/window-basic-main.hpp
UI/window-basic-main.hpp
+4
-0
未找到文件。
UI/api-interface.cpp
浏览文件 @
d17ee208
...
@@ -232,7 +232,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
...
@@ -232,7 +232,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool
obs_frontend_streaming_active
(
void
)
override
bool
obs_frontend_streaming_active
(
void
)
override
{
{
return
main
->
outputHandler
->
StreamingActive
();
bool
active
;
QMetaObject
::
invokeMethod
(
main
,
"StreamingActive"
,
WaitConnection
(),
Q_RETURN_ARG
(
bool
,
active
));
return
active
;
}
}
void
obs_frontend_recording_start
(
void
)
override
void
obs_frontend_recording_start
(
void
)
override
...
@@ -247,7 +252,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
...
@@ -247,7 +252,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool
obs_frontend_recording_active
(
void
)
override
bool
obs_frontend_recording_active
(
void
)
override
{
{
return
main
->
outputHandler
->
RecordingActive
();
bool
active
;
QMetaObject
::
invokeMethod
(
main
,
"RecordingActive"
,
WaitConnection
(),
Q_RETURN_ARG
(
bool
,
active
));
return
active
;
}
}
void
obs_frontend_replay_buffer_start
(
void
)
override
void
obs_frontend_replay_buffer_start
(
void
)
override
...
@@ -267,7 +277,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
...
@@ -267,7 +277,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool
obs_frontend_replay_buffer_active
(
void
)
override
bool
obs_frontend_replay_buffer_active
(
void
)
override
{
{
return
main
->
outputHandler
->
ReplayBufferActive
();
bool
active
;
QMetaObject
::
invokeMethod
(
main
,
"ReplayBufferActive"
,
WaitConnection
(),
Q_RETURN_ARG
(
bool
,
active
));
return
active
;
}
}
void
*
obs_frontend_add_tools_menu_qaction
(
const
char
*
name
)
override
void
*
obs_frontend_add_tools_menu_qaction
(
const
char
*
name
)
override
...
...
UI/window-basic-main.cpp
浏览文件 @
d17ee208
...
@@ -6998,3 +6998,24 @@ OBSBasic *OBSBasic::Get()
...
@@ -6998,3 +6998,24 @@ OBSBasic *OBSBasic::Get()
{
{
return
reinterpret_cast
<
OBSBasic
*>
(
App
()
->
GetMainWindow
());
return
reinterpret_cast
<
OBSBasic
*>
(
App
()
->
GetMainWindow
());
}
}
bool
OBSBasic
::
StreamingActive
()
{
if
(
!
outputHandler
)
return
false
;
return
outputHandler
->
StreamingActive
();
}
bool
OBSBasic
::
RecordingActive
()
{
if
(
!
outputHandler
)
return
false
;
return
outputHandler
->
RecordingActive
();
}
bool
OBSBasic
::
ReplayBufferActive
()
{
if
(
!
outputHandler
)
return
false
;
return
outputHandler
->
ReplayBufferActive
();
}
UI/window-basic-main.hpp
浏览文件 @
d17ee208
...
@@ -789,6 +789,10 @@ private slots:
...
@@ -789,6 +789,10 @@ private slots:
public
slots
:
public
slots
:
void
on_actionResetTransform_triggered
();
void
on_actionResetTransform_triggered
();
bool
StreamingActive
();
bool
RecordingActive
();
bool
ReplayBufferActive
();
public:
public:
explicit
OBSBasic
(
QWidget
*
parent
=
0
);
explicit
OBSBasic
(
QWidget
*
parent
=
0
);
virtual
~
OBSBasic
();
virtual
~
OBSBasic
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录