Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
a8ada497
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,发现更多精彩内容 >>
提交
a8ada497
编写于
12月 18, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
finish up preliminary settings stuff
上级
4da1c193
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
67 addition
and
11 deletion
+67
-11
build/data/obs-studio/locale/en.txt
build/data/obs-studio/locale/en.txt
+3
-1
obs/CMakeLists.txt
obs/CMakeLists.txt
+1
-0
obs/makefile.am
obs/makefile.am
+1
-0
obs/settings-basic-general.cpp
obs/settings-basic-general.cpp
+2
-3
obs/settings-basic-video.cpp
obs/settings-basic-video.cpp
+19
-7
obs/settings-basic.cpp
obs/settings-basic.cpp
+31
-0
obs/settings-basic.hpp
obs/settings-basic.hpp
+3
-0
obs/settings.hpp
obs/settings.hpp
+3
-0
vs/2013/OBS/OBS.vcxproj
vs/2013/OBS/OBS.vcxproj
+1
-0
vs/2013/OBS/OBS.vcxproj.filters
vs/2013/OBS/OBS.vcxproj.filters
+3
-0
未找到文件。
build/data/obs-studio/locale/en.txt
浏览文件 @
a8ada497
...
...
@@ -24,6 +24,8 @@ MainWindow.Volume="Volume:"
Settings="Settings"
Settings.StreamRestart="All streaming/recording must be stopped in order for these changes to take effect"
Settings.ConfirmTitle="Confirm Changes"
Settings.Confirm="You have unsaved changes. Save changes?"
Settings.General="General"
Settings.General.Language="Language:"
...
...
@@ -45,7 +47,7 @@ Settings.Video.FPS.Nanoseconds="Frame Interval (nanoseconds)"
Settings.Video.FPS.Numerator="Numerator:"
Settings.Video.FPS.Denominator="Denominator:"
Settings.Video.Renderer="Renderer:"
Settings.Video.InvalidResolution="Invalid
base
resolution value. Must be [width]x[height] (i.e. 1920x1080)"
Settings.Video.InvalidResolution="Invalid resolution value. Must be [width]x[height] (i.e. 1920x1080)"
Settings.Audio="Audio"
Settings.Audio.DesktopAudioDevice="Desktop Audio Device:"
...
...
obs/CMakeLists.txt
浏览文件 @
a8ada497
...
...
@@ -43,6 +43,7 @@ endif()
add_executable
(
obs
window-main-basic.cpp
window-settings-basic.cpp
settings-basic.cpp
settings-basic-general.cpp
settings-basic-video.cpp
wx-subclass.cpp
...
...
obs/makefile.am
浏览文件 @
a8ada497
...
...
@@ -14,6 +14,7 @@ obs_PROGRAMS = obs
obs_LDADD
=
$(top_srcdir)
/libobs/libobs.la
obs_SOURCES
=
window-main-basic.cpp
\
window-settings-basic.cpp
\
settings-basic.cpp
\
settings-basic-general.cpp
\
settings-basic-video.cpp
\
obs-app.cpp
\
...
...
obs/settings-basic-general.cpp
浏览文件 @
a8ada497
...
...
@@ -99,7 +99,7 @@ BasicGenData::BasicGenData(OBSBasicSettings *window)
void
BasicGenData
::
LanguageChanged
(
wxCommandEvent
&
event
)
{
dataChanged
=
true
;
SetChanged
()
;
window
->
generalChangedText
->
SetLabel
(
WXStr
(
"Settings.General.LanguageChanged"
));
window
->
generalChangedText
->
Show
();
...
...
@@ -118,8 +118,7 @@ void BasicGenData::Apply()
config_save
(
GetGlobalConfig
());
window
->
generalChangedText
->
Hide
();
dataChanged
=
false
;
SetSaved
();
}
BasicSettingsData
*
CreateBasicGeneralSettings
(
OBSBasicSettings
*
window
)
...
...
obs/settings-basic-video.cpp
浏览文件 @
a8ada497
...
...
@@ -50,10 +50,16 @@ class BasicVideoData : public BasicSettingsData {
void
SaveFPSFraction
();
void
SaveFPSNanoseconds
();
virtual
void
SetChanged
()
{
BasicSettingsData
::
SetChanged
();
window
->
videoChangedText
->
Show
();
}
public:
BasicVideoData
(
OBSBasicSettings
*
window
);
void
Apply
();
v
irtual
v
oid
Apply
();
};
struct
BaseLexer
{
...
...
@@ -107,7 +113,7 @@ int BasicVideoData::AddRes(uint32_t cx, uint32_t cy)
{
stringstream
res
;
res
<<
cx
<<
"x"
<<
cy
;
return
window
->
baseResList
->
Append
(
res
.
str
()
.
c_str
()
);
return
window
->
baseResList
->
Append
(
res
.
str
());
}
void
BasicVideoData
::
LoadOther
()
...
...
@@ -264,7 +270,13 @@ void BasicVideoData::ResetScaleList(uint32_t cx, uint32_t cy)
res
<<
uint32_t
(
double
(
cx
)
/
vals
[
i
]);
res
<<
"x"
;
res
<<
uint32_t
(
double
(
cy
)
/
vals
[
i
]);
window
->
outputResList
->
Append
(
res
.
str
().
c_str
());
window
->
outputResList
->
Append
(
res
.
str
());
}
if
(
numVals
)
{
stringstream
str
;
str
<<
cx
<<
"x"
<<
cy
;
window
->
outputResList
->
SetValue
(
str
.
str
());
}
}
...
...
@@ -298,7 +310,7 @@ void BasicVideoData::BaseResListChanged(wxCommandEvent &event)
return
;
}
dataChanged
=
true
;
SetChanged
()
;
window
->
videoChangedText
->
SetLabel
(
WXStr
(
"Settings.StreamRestart"
));
window
->
videoChangedText
->
Show
();
...
...
@@ -315,7 +327,7 @@ void BasicVideoData::OutputResListChanged(wxCommandEvent &event)
return
;
}
dataChanged
=
true
;
SetChanged
()
;
window
->
videoChangedText
->
SetLabel
(
WXStr
(
"Settings.StreamRestart"
));
window
->
videoChangedText
->
Show
();
}
...
...
@@ -398,9 +410,9 @@ void BasicVideoData::Apply()
SaveOther
();
SaveFPSData
();
window
->
videoChangedText
->
Hide
();
config_save
(
GetGlobalConfig
());
dataChanged
=
false
;
SetSaved
();
}
BasicSettingsData
*
CreateBasicVideoSettings
(
OBSBasicSettings
*
window
)
...
...
obs/settings-basic.cpp
0 → 100644
浏览文件 @
a8ada497
/******************************************************************************
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "settings-basic.hpp"
#include "window-settings-basic.hpp"
void
BasicSettingsData
::
SetChanged
()
{
dataChanged
=
true
;
window
->
applyButton
->
Enable
();
}
void
BasicSettingsData
::
SetSaved
()
{
dataChanged
=
false
;
window
->
applyButton
->
Disable
();
}
obs/settings-basic.hpp
浏览文件 @
a8ada497
...
...
@@ -27,6 +27,9 @@ protected:
public:
inline
BasicSettingsData
(
OBSBasicSettings
*
window
)
:
window
(
window
)
{}
virtual
void
SetChanged
();
virtual
void
SetSaved
();
};
BasicSettingsData
*
CreateBasicGeneralSettings
(
OBSBasicSettings
*
window
);
...
...
obs/settings.hpp
浏览文件 @
a8ada497
...
...
@@ -27,5 +27,8 @@ public:
inline
SettingsData
()
:
dataChanged
(
false
)
{}
virtual
void
Apply
()
=
0
;
virtual
void
SetChanged
()
=
0
;
virtual
void
SetSaved
()
=
0
;
inline
bool
DataChanged
()
const
{
return
dataChanged
;}
};
vs/2013/OBS/OBS.vcxproj
浏览文件 @
a8ada497
...
...
@@ -176,6 +176,7 @@
<ClCompile
Include=
"..\..\..\obs\platform-windows.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\settings-basic-general.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\settings-basic-video.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\settings-basic.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\window-main-basic.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\window-settings-basic.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\wx-subclass.cpp"
/>
...
...
vs/2013/OBS/OBS.vcxproj.filters
浏览文件 @
a8ada497
...
...
@@ -45,6 +45,9 @@
<ClCompile
Include=
"..\..\..\obs\settings-basic-video.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
<ClCompile
Include=
"..\..\..\obs\settings-basic.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\..\..\obs\obs-app.hpp"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录