Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
0434ef0f
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,发现更多精彩内容 >>
提交
0434ef0f
编写于
12月 06, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change naming for some main program files for consistency
上级
2c886a9d
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
53 addition
and
39 deletion
+53
-39
build/locale/en-US.txt
build/locale/en-US.txt
+12
-0
obs/forms/OBSWindows.cpp
obs/forms/OBSWindows.cpp
+1
-1
obs/forms/OBSWindows.fbp
obs/forms/OBSWindows.fbp
+18
-18
obs/forms/OBSWindows.h
obs/forms/OBSWindows.h
+1
-1
obs/obs-app.cpp
obs/obs-app.cpp
+2
-1
obs/window-main-basic.cpp
obs/window-main-basic.cpp
+2
-1
obs/window-main-basic.hpp
obs/window-main-basic.hpp
+0
-0
obs/wx-subclass.cpp
obs/wx-subclass.cpp
+1
-1
obs/wx-subclass.hpp
obs/wx-subclass.hpp
+0
-0
vs/2010/OBS/OBS.vcxproj
vs/2010/OBS/OBS.vcxproj
+4
-4
vs/2010/OBS/OBS.vcxproj.filters
vs/2010/OBS/OBS.vcxproj.filters
+12
-12
未找到文件。
build/locale/en-US.txt
0 → 100644
浏览文件 @
0434ef0f
OK="OK"
Cancel="Cancel"
MainWindow.Exit="Exit"
MainWindow.Lock="Lock Preview"
MainWindow.Preview="Enable Preview"
MainWindow.Scenes="Scenes"
MainWindow.Sources="Sources"
MainWindow.StartRecording="Start Recording"
MainWindow.StartStream="Start Stream"
MainWindow.StopRecording="Stop Recording"
MainWindow.StopStream="Stop Stream"
obs/forms/OBSWindows.cpp
浏览文件 @
0434ef0f
...
...
@@ -36,7 +36,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
fileMenu
->
AppendSeparator
();
wxMenuItem
*
file_exit
;
file_exit
=
new
wxMenuItem
(
fileMenu
,
ID_FILE_EXIT
,
wxString
(
_
(
"Main
Menu.File
.Exit"
)
)
,
wxEmptyString
,
wxITEM_NORMAL
);
file_exit
=
new
wxMenuItem
(
fileMenu
,
ID_FILE_EXIT
,
wxString
(
_
(
"Main
Window
.Exit"
)
)
,
wxEmptyString
,
wxITEM_NORMAL
);
fileMenu
->
Append
(
file_exit
);
mainMenu
->
Append
(
fileMenu
,
_
(
"MainMenu.File"
)
);
...
...
obs/forms/OBSWindows.fbp
浏览文件 @
0434ef0f
...
...
@@ -26,7 +26,7 @@
<property
name=
"ui_table"
>
UI
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Frame"
expanded=
"
1
"
>
<object
class=
"Frame"
expanded=
"
0
"
>
<property
name=
"aui_managed"
>
0
</property>
<property
name=
"aui_manager_style"
>
wxAUI_MGR_DEFAULT
</property>
<property
name=
"bg"
></property>
...
...
@@ -46,7 +46,7 @@
<property
name=
"pos"
></property>
<property
name=
"size"
>
1117,783
</property>
<property
name=
"style"
>
wxDEFAULT_FRAME_STYLE
</property>
<property
name=
"subclass"
>
WindowSubclass; ../w
indow
-subclass.hpp
</property>
<property
name=
"subclass"
>
WindowSubclass; ../w
x
-subclass.hpp
</property>
<property
name=
"title"
>
.mainwindow
</property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
...
...
@@ -193,7 +193,7 @@
<property
name=
"help"
></property>
<property
name=
"id"
>
ID_FILE_EXIT
</property>
<property
name=
"kind"
>
wxITEM_NORMAL
</property>
<property
name=
"label"
>
Main
Menu.File
.Exit
</property>
<property
name=
"label"
>
Main
Window
.Exit
</property>
<property
name=
"name"
>
file_exit
</property>
<property
name=
"permission"
>
none
</property>
<property
name=
"shortcut"
></property>
...
...
@@ -203,16 +203,16 @@
</object>
</object>
</object>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
mainContainer
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
0
</property>
<property
name=
"flag"
>
wxEXPAND | wxALL
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxPanel"
expanded=
"
1
"
>
<object
class=
"wxPanel"
expanded=
"
0
"
>
<property
name=
"BottomDockable"
>
1
</property>
<property
name=
"LeftDockable"
>
1
</property>
<property
name=
"RightDockable"
>
1
</property>
...
...
@@ -286,25 +286,25 @@
<event
name=
"OnSetFocus"
></event>
<event
name=
"OnSize"
></event>
<event
name=
"OnUpdateUI"
></event>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
panelContainer
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxEXPAND
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
previewContainer
</property>
<property
name=
"orient"
>
wxHORIZONTAL
</property>
<property
name=
"permission"
>
protected
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
previewVertical
</property>
<property
name=
"orient"
>
wxHORIZONTAL
</property>
...
...
@@ -404,29 +404,29 @@
</object>
</object>
</object>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxEXPAND
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
>
-1,155
</property>
<property
name=
"name"
>
bottomContainer
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER|wxEXPAND
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
bSizer36
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<property
name=
"minimum_size"
>
625,-1
</property>
<property
name=
"name"
>
bottomCenterContainer
</property>
<property
name=
"orient"
>
wxHORIZONTAL
</property>
...
...
@@ -2157,7 +2157,7 @@
<property
name=
"pos"
></property>
<property
name=
"size"
>
1240,825
</property>
<property
name=
"style"
>
wxDEFAULT_FRAME_STYLE
</property>
<property
name=
"subclass"
>
WindowSubclass; ../w
indow
-subclass.hpp
</property>
<property
name=
"subclass"
>
WindowSubclass; ../w
x
-subclass.hpp
</property>
<property
name=
"title"
>
.openBroadcastStudio
</property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
...
...
obs/forms/OBSWindows.h
浏览文件 @
0434ef0f
...
...
@@ -13,7 +13,7 @@
#include <wx/intl.h>
class
WindowSubclass
;
#include "../w
indow
-subclass.hpp"
#include "../w
x
-subclass.hpp"
#include <wx/string.h>
#include <wx/bitmap.h>
#include <wx/image.h>
...
...
obs/obs-app.cpp
浏览文件 @
0434ef0f
...
...
@@ -21,9 +21,10 @@
#include <util/platform.h>
#include "obs-app.hpp"
#include "window-
obs
-basic.hpp"
#include "window-
main
-basic.hpp"
#include "obs-wrappers.hpp"
#include "wx-wrappers.hpp"
using
namespace
std
;
IMPLEMENT_APP
(
OBSApp
);
...
...
obs/window-
obs
-basic.cpp
→
obs/window-
main
-basic.cpp
浏览文件 @
0434ef0f
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "obs-app.hpp"
#include "window-
obs
-basic.hpp"
#include "window-
main
-basic.hpp"
void
OBSBasic
::
OnClose
(
wxCloseEvent
&
event
)
{
...
...
@@ -38,6 +38,7 @@ void OBSBasic::OnSize(wxSizeEvent& event)
if
(
!
obs_get_video_info
(
&
ovi
))
return
;
/* resize preview panel to fix to the top section of the window */
wxSize
targetSize
=
GetPreviewContainer
()
->
GetSize
();
double
targetAspect
=
double
(
targetSize
.
x
)
/
double
(
targetSize
.
y
);
double
baseAspect
=
double
(
ovi
.
base_width
)
/
double
(
ovi
.
base_height
);
...
...
obs/window-
obs
-basic.hpp
→
obs/window-
main
-basic.hpp
浏览文件 @
0434ef0f
文件已移动
obs/w
indow
-subclass.cpp
→
obs/w
x
-subclass.cpp
浏览文件 @
0434ef0f
...
...
@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "w
indow
-subclass.hpp"
#include "w
x
-subclass.hpp"
#ifndef WX_PRECOMP
#include <wx/dcclient.h>
...
...
obs/w
indow
-subclass.hpp
→
obs/w
x
-subclass.hpp
浏览文件 @
0434ef0f
文件已移动
vs/2010/OBS/OBS.vcxproj
浏览文件 @
0434ef0f
...
...
@@ -169,16 +169,16 @@
<ItemGroup>
<ClCompile
Include=
"..\..\..\obs\forms\OBSWindows.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\obs-app.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\window-
obs
-basic.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\w
indow
-subclass.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\window-
main
-basic.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\w
x
-subclass.cpp"
/>
<ClCompile
Include=
"..\..\..\obs\wx-wrappers.cpp"
/>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\..\..\obs\forms\OBSWindows.h"
/>
<ClInclude
Include=
"..\..\..\obs\obs-app.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\obs-wrappers.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\window-
obs
-basic.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\w
indow
-subclass.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\window-
main
-basic.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\w
x
-subclass.hpp"
/>
<ClInclude
Include=
"..\..\..\obs\wx-wrappers.hpp"
/>
</ItemGroup>
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
...
...
vs/2010/OBS/OBS.vcxproj.filters
浏览文件 @
0434ef0f
...
...
@@ -18,12 +18,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile
Include=
"..\..\..\obs\window-obs-basic.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
<ClCompile
Include=
"..\..\..\obs\window-subclass.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
<ClCompile
Include=
"..\..\..\obs\obs-app.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
...
...
@@ -33,14 +27,14 @@
<ClCompile
Include=
"..\..\..\obs\forms\OBSWindows.cpp"
>
<Filter>
wx forms
</Filter>
</ClCompile>
<ClCompile
Include=
"..\..\..\obs\window-main-basic.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
<ClCompile
Include=
"..\..\..\obs\wx-subclass.cpp"
>
<Filter>
Source Files
</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\..\..\obs\window-obs-basic.hpp"
>
<Filter>
Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\obs\window-subclass.hpp"
>
<Filter>
Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\obs\obs-app.hpp"
>
<Filter>
Header Files
</Filter>
</ClInclude>
...
...
@@ -53,5 +47,11 @@
<ClInclude
Include=
"..\..\..\obs\forms\OBSWindows.h"
>
<Filter>
wx forms
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\obs\window-main-basic.hpp"
>
<Filter>
Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\obs\wx-subclass.hpp"
>
<Filter>
Header Files
</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录