Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
5f6cf614
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,发现更多精彩内容 >>
提交
5f6cf614
编写于
12月 22, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add 25 FPS to 'common FPS' list, clean up window initialization for it
上级
399b0c8d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
23 deletion
+14
-23
obs/forms/OBSWindows.cpp
obs/forms/OBSWindows.cpp
+3
-2
obs/forms/OBSWindows.fbp
obs/forms/OBSWindows.fbp
+3
-3
obs/obs-app.cpp
obs/obs-app.cpp
+3
-0
obs/settings-basic-video.cpp
obs/settings-basic-video.cpp
+5
-18
未找到文件。
obs/forms/OBSWindows.cpp
浏览文件 @
5f6cf614
...
...
@@ -556,15 +556,16 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
wxBoxSizer
*
bSizer45
;
bSizer45
=
new
wxBoxSizer
(
wxHORIZONTAL
);
fpsCommonList
=
new
wxComboBox
(
m_panel13
,
ID_FPS_COMMON
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
fpsCommonList
=
new
wxComboBox
(
m_panel13
,
ID_FPS_COMMON
,
_
(
"30"
)
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
fpsCommonList
->
Append
(
_
(
"10"
)
);
fpsCommonList
->
Append
(
_
(
"20"
)
);
fpsCommonList
->
Append
(
_
(
"25"
)
);
fpsCommonList
->
Append
(
_
(
"29.97"
)
);
fpsCommonList
->
Append
(
_
(
"30"
)
);
fpsCommonList
->
Append
(
_
(
"48"
)
);
fpsCommonList
->
Append
(
_
(
"59.94"
)
);
fpsCommonList
->
Append
(
_
(
"60"
)
);
fpsCommonList
->
SetSelection
(
3
);
fpsCommonList
->
SetSelection
(
4
);
bSizer45
->
Add
(
fpsCommonList
,
0
,
wxTOP
|
wxBOTTOM
|
wxRIGHT
,
2
);
...
...
obs/forms/OBSWindows.fbp
浏览文件 @
5f6cf614
...
...
@@ -4929,7 +4929,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">"10" "20" "29.97" "30" "48" "59.94" "60"</property>
<property name="choices">"10" "20" "2
5" "2
9.97" "30" "48" "59.94" "60"</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
...
...
@@ -4959,7 +4959,7 @@
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">
3
</property>
<property name="selection">
4
</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxCB_READONLY</property>
...
...
@@ -4970,7 +4970,7 @@
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="value">
30
</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
...
...
obs/obs-app.cpp
浏览文件 @
5f6cf614
...
...
@@ -227,6 +227,9 @@ void OBSApp::GetFPSCommon(uint32_t &num, uint32_t &den) const
}
else
if
(
strcmp
(
val
,
"20"
)
==
0
)
{
num
=
20
;
den
=
1
;
}
else
if
(
strcmp
(
val
,
"25"
)
==
0
)
{
num
=
25
;
den
=
1
;
}
else
if
(
strcmp
(
val
,
"29.97"
)
==
0
)
{
num
=
30000
;
den
=
1001
;
...
...
obs/settings-basic-video.cpp
浏览文件 @
5f6cf614
...
...
@@ -196,26 +196,13 @@ void BasicVideoData::LoadFPSData()
void
BasicVideoData
::
LoadFPSCommon
()
{
const
char
*
str
=
config_get_string
(
GetGlobalConfig
(),
"Video"
,
const
char
*
val
=
config_get_string
(
GetGlobalConfig
(),
"Video"
,
"FPSCommon"
);
int
val
=
3
;
if
(
strcmp
(
str
,
"10"
)
==
0
)
val
=
0
;
else
if
(
strcmp
(
str
,
"20"
)
==
0
)
val
=
1
;
else
if
(
strcmp
(
str
,
"29.97"
)
==
0
)
val
=
2
;
else
if
(
strcmp
(
str
,
"30"
)
==
0
)
val
=
3
;
else
if
(
strcmp
(
str
,
"48"
)
==
0
)
val
=
4
;
else
if
(
strcmp
(
str
,
"59.94"
)
==
0
)
val
=
5
;
else
if
(
strcmp
(
str
,
"60"
)
==
0
)
val
=
6
;
window
->
fpsCommonList
->
SetSelection
(
val
);
int
sel
=
window
->
fpsCommonList
->
FindString
(
val
);
if
(
sel
==
wxNOT_FOUND
)
sel
=
window
->
fpsCommonList
->
FindString
(
"30"
);
window
->
fpsCommonList
->
SetSelection
(
sel
);
}
void
BasicVideoData
::
LoadFPSInteger
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录