Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
563613db
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,发现更多精彩内容 >>
提交
563613db
编写于
1月 26, 2014
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename obs-data.h to obs-internal.h
Renaming obs-data.h to avoid confusion about its usage
上级
a5372e97
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
14 addition
and
14 deletion
+14
-14
libobs/CMakeLists.txt
libobs/CMakeLists.txt
+1
-1
libobs/obs-cocoa.c
libobs/obs-cocoa.c
+1
-1
libobs/obs-display.c
libobs/obs-display.c
+1
-1
libobs/obs-encoder.c
libobs/obs-encoder.c
+1
-1
libobs/obs-internal.h
libobs/obs-internal.h
+0
-0
libobs/obs-module.c
libobs/obs-module.c
+1
-1
libobs/obs-output.c
libobs/obs-output.c
+1
-1
libobs/obs-source.c
libobs/obs-source.c
+1
-1
libobs/obs-video.c
libobs/obs-video.c
+1
-1
libobs/obs-windows.c
libobs/obs-windows.c
+1
-1
libobs/obs.c
libobs/obs.c
+1
-1
vs/2013/libobs/libobs.vcxproj
vs/2013/libobs/libobs.vcxproj
+1
-1
vs/2013/libobs/libobs.vcxproj.filters
vs/2013/libobs/libobs.vcxproj.filters
+3
-3
未找到文件。
libobs/CMakeLists.txt
浏览文件 @
563613db
...
...
@@ -146,7 +146,7 @@ set(libobs_libobs_HEADERS
obs-defs.h
obs-encoder.h
obs-service.h
obs-
data
.h
obs-
internal
.h
obs.h
obs-module.h
obs-scene.h
...
...
libobs/obs-cocoa.c
浏览文件 @
563613db
...
...
@@ -18,7 +18,7 @@
#include "util/platform.h"
#include "util/dstr.h"
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
#include <unistd.h>
...
...
libobs/obs-display.c
浏览文件 @
563613db
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
obs_display_t
obs_display_create
(
struct
gs_init_data
*
graphics_data
)
{
...
...
libobs/obs-encoder.c
浏览文件 @
563613db
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
bool
load_encoder_info
(
void
*
module
,
const
char
*
module_name
,
const
char
*
id
,
struct
encoder_info
*
info
)
...
...
libobs/obs-
data
.h
→
libobs/obs-
internal
.h
浏览文件 @
563613db
文件已移动
libobs/obs-module.c
浏览文件 @
563613db
...
...
@@ -19,7 +19,7 @@
#include "util/dstr.h"
#include "obs-defs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
#include "obs-module.h"
void
*
load_module_subfunc
(
void
*
module
,
const
char
*
module_name
,
...
...
libobs/obs-output.c
浏览文件 @
563613db
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
bool
load_output_info
(
void
*
module
,
const
char
*
module_name
,
const
char
*
id
,
struct
output_info
*
info
)
...
...
libobs/obs-source.c
浏览文件 @
563613db
...
...
@@ -22,7 +22,7 @@
#include "graphics/vec3.h"
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
static
void
obs_source_destroy
(
obs_source_t
source
);
...
...
libobs/obs-video.c
浏览文件 @
563613db
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
#include "graphics/vec4.h"
static
void
tick_sources
(
uint64_t
cur_time
,
uint64_t
*
last_time
)
...
...
libobs/obs-windows.c
浏览文件 @
563613db
...
...
@@ -18,7 +18,7 @@
#include "util/platform.h"
#include "util/dstr.h"
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
static
inline
bool
check_path
(
const
char
*
data
,
const
char
*
path
,
struct
dstr
*
output
)
...
...
libobs/obs.c
浏览文件 @
563613db
...
...
@@ -18,7 +18,7 @@
#include "callback/calldata.h"
#include "obs.h"
#include "obs-
data
.h"
#include "obs-
internal
.h"
#include "obs-module.h"
struct
obs_subsystem
*
obs
=
NULL
;
...
...
vs/2013/libobs/libobs.vcxproj
浏览文件 @
563613db
...
...
@@ -43,9 +43,9 @@
<ClInclude
Include=
"..\..\..\libobs\media-io\audio-resampler.h"
/>
<ClInclude
Include=
"..\..\..\libobs\media-io\format-conversion.h"
/>
<ClInclude
Include=
"..\..\..\libobs\media-io\video-io.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-data.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-defs.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-encoder.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-internal.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-module.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-output.h"
/>
<ClInclude
Include=
"..\..\..\libobs\obs-scene.h"
/>
...
...
vs/2013/libobs/libobs.vcxproj.filters
浏览文件 @
563613db
...
...
@@ -66,9 +66,6 @@
<ClInclude
Include=
"..\..\..\libobs\obs-defs.h"
>
<Filter>
libobs\Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\libobs\obs-data.h"
>
<Filter>
libobs\Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\libobs\obs.h"
>
<Filter>
libobs\Header Files
</Filter>
</ClInclude>
...
...
@@ -201,6 +198,9 @@
<ClInclude
Include=
"..\..\..\libobs\obs-encoder.h"
>
<Filter>
libobs\Header Files
</Filter>
</ClInclude>
<ClInclude
Include=
"..\..\..\libobs\obs-internal.h"
>
<Filter>
libobs\Header Files
</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile
Include=
"..\..\..\libobs\obs-output.c"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录