Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
197c56c9
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,发现更多精彩内容 >>
提交
197c56c9
编写于
12月 17, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add code to select renderer
上级
4f234952
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
46 addition
and
6 deletion
+46
-6
obs/obs-app.cpp
obs/obs-app.cpp
+8
-0
obs/platform-windows.cpp
obs/platform-windows.cpp
+5
-6
obs/settings-basic-video.cpp
obs/settings-basic-video.cpp
+33
-0
未找到文件。
obs/obs-app.cpp
浏览文件 @
197c56c9
...
...
@@ -69,6 +69,14 @@ bool OBSApp::InitGlobalConfigDefaults()
uint32_t
cx
=
monitors
[
0
].
cx
;
uint32_t
cy
=
monitors
[
0
].
cy
;
#if _WIN32
config_set_default_string
(
globalConfig
,
"Video"
,
"Renderer"
,
"Direct3D 11"
);
#else
config_set_default_string
(
globalConfig
,
"Video"
,
"Renderer"
,
"OpenGL"
);
#endif
config_set_default_uint
(
globalConfig
,
"Video"
,
"BaseCX"
,
cx
);
config_set_default_uint
(
globalConfig
,
"Video"
,
"BaseCY"
,
cy
);
...
...
obs/platform-windows.cpp
浏览文件 @
197c56c9
...
...
@@ -36,12 +36,11 @@ static BOOL CALLBACK OBSMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor,
{
vector
<
MonitorInfo
>
&
monitors
=
*
(
vector
<
MonitorInfo
>
*
)
param
;
MonitorInfo
monitor
;
monitor
.
x
=
rect
->
left
;
monitor
.
y
=
rect
->
top
;
monitor
.
cx
=
rect
->
right
-
rect
->
left
;
monitor
.
cy
=
rect
->
bottom
-
rect
->
top
;
monitors
.
push_back
(
monitor
);
monitors
.
emplace_back
(
rect
->
left
,
rect
->
top
,
rect
->
right
-
rect
->
left
,
rect
->
bottom
-
rect
->
top
);
return
true
;
}
...
...
obs/settings-basic-video.cpp
浏览文件 @
197c56c9
...
...
@@ -30,6 +30,7 @@ class BasicVideoData : public BasicSettingsData {
ConnectorList
connections
;
int
AddRes
(
uint32_t
cx
,
uint32_t
cy
);
void
LoadOther
();
void
LoadResolutionData
();
void
LoadFPSData
();
void
LoadFPSCommon
();
...
...
@@ -41,6 +42,7 @@ class BasicVideoData : public BasicSettingsData {
void
BaseResListChanged
(
wxCommandEvent
&
event
);
void
OutputResListChanged
(
wxCommandEvent
&
event
);
void
SaveOther
();
void
SaveFPSData
();
void
SaveFPSCommon
();
void
SaveFPSInteger
();
...
...
@@ -107,6 +109,24 @@ int BasicVideoData::AddRes(uint32_t cx, uint32_t cy)
return
window
->
baseResList
->
Append
(
res
.
str
().
c_str
());
}
void
BasicVideoData
::
LoadOther
()
{
const
char
*
renderer
=
config_get_string
(
GetGlobalConfig
(),
"Video"
,
"Renderer"
);
window
->
rendererList
->
Clear
();
window
->
rendererList
->
Append
(
"OpenGL"
);
#ifdef _WIN32
window
->
rendererList
->
Append
(
"Direct3D 11"
);
#endif
int
sel
=
window
->
rendererList
->
FindString
(
renderer
);
if
(
sel
==
wxNOT_FOUND
)
sel
=
0
;
window
->
rendererList
->
SetSelection
(
sel
);
}
void
BasicVideoData
::
LoadResolutionData
()
{
window
->
baseResList
->
Clear
();
...
...
@@ -243,6 +263,7 @@ BasicVideoData::BasicVideoData(OBSBasicSettings *window)
{
LoadResolutionData
();
LoadFPSData
();
LoadOther
();
/* load connectors after loading data to prevent them from triggering */
connections
.
Add
(
window
->
baseResList
,
wxEVT_TEXT
,
...
...
@@ -289,6 +310,17 @@ void BasicVideoData::OutputResListChanged(wxCommandEvent &event)
window
->
videoChangedText
->
Show
();
}
void
BasicVideoData
::
SaveOther
()
{
int
sel
=
window
->
rendererList
->
GetSelection
();
if
(
sel
==
wxNOT_FOUND
)
return
;
wxString
renderer
=
window
->
rendererList
->
GetString
(
sel
);
config_set_string
(
GetGlobalConfig
(),
"Video"
,
"Renderer"
,
renderer
.
c_str
());
}
void
BasicVideoData
::
SaveFPSData
()
{
int
id
=
window
->
fpsTypeList
->
GetCurrentPage
()
->
GetId
();
...
...
@@ -302,6 +334,7 @@ void BasicVideoData::SaveFPSData()
}
config_set_string
(
GetGlobalConfig
(),
"Video"
,
"FPSType"
,
type
);
SaveOther
();
SaveFPSCommon
();
SaveFPSInteger
();
SaveFPSFraction
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录