Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
dd1c5b43
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,发现更多精彩内容 >>
提交
dd1c5b43
编写于
12月 14, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add some preliminary resolution data to video settings (will need to query monitors in the future)
上级
f50fbfd1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
48 addition
and
2 deletion
+48
-2
obs/obs-app.cpp
obs/obs-app.cpp
+1
-1
obs/settings-basic-general.cpp
obs/settings-basic-general.cpp
+2
-0
obs/settings-basic-video.cpp
obs/settings-basic-video.cpp
+27
-1
obs/window-settings-basic.cpp
obs/window-settings-basic.cpp
+18
-0
未找到文件。
obs/obs-app.cpp
浏览文件 @
dd1c5b43
...
...
@@ -70,7 +70,7 @@ static bool do_mkdir(const char *path)
static
bool
MakeUserDirs
()
{
BPtr
<
char
*>
homePath
=
os_get_home_path
(
);
BPtr
<
char
*>
homePath
(
os_get_home_path
()
);
stringstream
str
;
str
<<
homePath
<<
"/obs-studio"
;
...
...
obs/settings-basic-general.cpp
浏览文件 @
dd1c5b43
...
...
@@ -62,6 +62,8 @@ int BasicGenData::AddLanguage(const char *tag)
void
BasicGenData
::
FillLanguageList
(
const
char
*
currentLang
)
{
window
->
languageList
->
Clear
();
size_t
numSections
=
config_num_sections
(
localeIni
);
for
(
size_t
i
=
0
;
i
<
numSections
;
i
++
)
{
const
char
*
lang
=
config_get_section
(
localeIni
,
i
);
...
...
obs/settings-basic-video.cpp
浏览文件 @
dd1c5b43
...
...
@@ -27,17 +27,43 @@ class BasicVideoData : public BasicSettingsData {
public:
BasicVideoData
(
OBSBasicSettings
*
window
);
void
Apply
();
};
BasicVideoData
::
BasicVideoData
(
OBSBasicSettings
*
window
)
:
BasicSettingsData
(
window
)
{
connections
.
Add
(
window
->
baseResList
,
wxEVT_
COMBOBOX
,
connections
.
Add
(
window
->
baseResList
,
wxEVT_
TEXT
,
wxCommandEventHandler
(
BasicVideoData
::
BaseResListChanged
),
NULL
,
this
);
window
->
baseResList
->
Clear
();
window
->
baseResList
->
Append
(
"640x480"
);
window
->
baseResList
->
Append
(
"800x600"
);
window
->
baseResList
->
Append
(
"1024x768"
);
window
->
baseResList
->
Append
(
"1280x720"
);
window
->
baseResList
->
Append
(
"1920x1080"
);
}
void
BasicVideoData
::
BaseResListChanged
(
wxCommandEvent
&
event
)
{
}
void
BasicVideoData
::
Apply
()
{
}
BasicSettingsData
*
CreateBasicVideoSettings
(
OBSBasicSettings
*
window
)
{
BasicSettingsData
*
data
=
NULL
;
try
{
data
=
new
BasicVideoData
(
window
);
}
catch
(
const
char
*
error
)
{
blog
(
LOG_ERROR
,
"CreateBasicVideoSettings failed: %s"
,
error
);
}
return
data
;
}
obs/window-settings-basic.cpp
浏览文件 @
dd1c5b43
...
...
@@ -26,6 +26,24 @@ OBSBasicSettings::OBSBasicSettings(wxWindow *parent)
void
OBSBasicSettings
::
PageChanged
(
wxListbookEvent
&
event
)
{
wxWindow
*
curPage
=
settingsList
->
GetCurrentPage
();
if
(
!
curPage
)
return
;
int
id
=
curPage
->
GetId
();
BasicSettingsData
*
ptr
=
NULL
;
switch
(
id
)
{
case
ID_SETTINGS_GENERAL
:
ptr
=
CreateBasicGeneralSettings
(
this
);
break
;
case
ID_SETTINGS_VIDEO
:
ptr
=
CreateBasicVideoSettings
(
this
);
break
;
}
settings
=
move
(
unique_ptr
<
BasicSettingsData
>
(
ptr
));
}
void
OBSBasicSettings
::
PageChanging
(
wxListbookEvent
&
event
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录