Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
5ea62d5e
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,发现更多精彩内容 >>
未验证
提交
5ea62d5e
编写于
10月 14, 2019
作者:
J
Jim
提交者:
GitHub
10月 14, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2075 from luzpaz/misc-typos
Fix various typos
上级
c52f2cae
d124e640
变更
33
隐藏空白更改
内联
并排
Showing
33 changed file
with
57 addition
and
57 deletion
+57
-57
UI/audio-encoders.cpp
UI/audio-encoders.cpp
+1
-1
UI/data/themes/Acri.qss
UI/data/themes/Acri.qss
+1
-1
UI/data/themes/Dark.qss
UI/data/themes/Dark.qss
+1
-1
UI/data/themes/Rachni.qss
UI/data/themes/Rachni.qss
+1
-1
UI/data/themes/System.qss
UI/data/themes/System.qss
+1
-1
UI/volume-control.cpp
UI/volume-control.cpp
+1
-1
UI/window-projector.cpp
UI/window-projector.cpp
+1
-1
cmake/Modules/CopyMSVCBins.cmake
cmake/Modules/CopyMSVCBins.cmake
+2
-2
cmake/Modules/FindFFmpeg.cmake
cmake/Modules/FindFFmpeg.cmake
+1
-1
deps/obs-scripting/CMakeLists.txt
deps/obs-scripting/CMakeLists.txt
+1
-1
docs/sphinx/frontends.rst
docs/sphinx/frontends.rst
+1
-1
docs/sphinx/reference-libobs-graphics-graphics.rst
docs/sphinx/reference-libobs-graphics-graphics.rst
+1
-1
docs/sphinx/reference-libobs-graphics-vec2.rst
docs/sphinx/reference-libobs-graphics-vec2.rst
+1
-1
docs/sphinx/reference-libobs-graphics-vec3.rst
docs/sphinx/reference-libobs-graphics-vec3.rst
+1
-1
docs/sphinx/reference-libobs-graphics-vec4.rst
docs/sphinx/reference-libobs-graphics-vec4.rst
+1
-1
docs/sphinx/reference-libobs-util-darray.rst
docs/sphinx/reference-libobs-util-darray.rst
+1
-1
docs/sphinx/reference-libobs-util-dstr.rst
docs/sphinx/reference-libobs-util-dstr.rst
+3
-3
docs/sphinx/reference-libobs-util-platform.rst
docs/sphinx/reference-libobs-util-platform.rst
+1
-1
docs/sphinx/reference-libobs-util-profiler.rst
docs/sphinx/reference-libobs-util-profiler.rst
+2
-2
docs/sphinx/reference-libobs-util-threading.rst
docs/sphinx/reference-libobs-util-threading.rst
+4
-4
docs/sphinx/reference-modules.rst
docs/sphinx/reference-modules.rst
+1
-1
docs/sphinx/reference-outputs.rst
docs/sphinx/reference-outputs.rst
+6
-6
docs/sphinx/reference-properties.rst
docs/sphinx/reference-properties.rst
+1
-1
docs/sphinx/reference-scenes.rst
docs/sphinx/reference-scenes.rst
+1
-1
docs/sphinx/reference-sources.rst
docs/sphinx/reference-sources.rst
+7
-7
libobs/audio-monitoring/pulse/pulseaudio-output.c
libobs/audio-monitoring/pulse/pulseaudio-output.c
+1
-1
libobs/audio-monitoring/pulse/pulseaudio-wrapper.h
libobs/audio-monitoring/pulse/pulseaudio-wrapper.h
+1
-1
libobs/graphics/libnsgif/libnsgif.c
libobs/graphics/libnsgif/libnsgif.c
+2
-2
libobs/graphics/libnsgif/libnsgif.h
libobs/graphics/libnsgif/libnsgif.h
+3
-3
libobs/obs-service.h
libobs/obs-service.h
+1
-1
libobs/obs-ui.h
libobs/obs-ui.h
+1
-1
libobs/obs.h
libobs/obs.h
+2
-2
plugins/CMakeLists.txt
plugins/CMakeLists.txt
+3
-3
未找到文件。
UI/audio-encoders.cpp
浏览文件 @
5ea62d5e
...
@@ -175,7 +175,7 @@ static void PopulateBitrateMap()
...
@@ -175,7 +175,7 @@ static void PopulateBitrateMap()
if
(
aac_
!=
GetCodec
(
encoder
.
c_str
()))
if
(
aac_
!=
GetCodec
(
encoder
.
c_str
()))
continue
;
continue
;
// disable mf_aac if audio ouput is not stereo nor mono
// disable mf_aac if audio ou
t
put is not stereo nor mono
if
((
output_channels
>=
3
)
&&
(
encoder
==
"mf_aac"
))
if
((
output_channels
>=
3
)
&&
(
encoder
==
"mf_aac"
))
continue
;
continue
;
...
...
UI/data/themes/Acri.qss
浏览文件 @
5ea62d5e
...
@@ -957,7 +957,7 @@ LockedCheckBox::indicator:unchecked:hover {
...
@@ -957,7 +957,7 @@ LockedCheckBox::indicator:unchecked:hover {
image: url(:res/images/unlocked.svg);
image: url(:res/images/unlocked.svg);
}
}
/* Visibilty CheckBox */
/* Visibil
i
ty CheckBox */
VisibilityCheckBox {
VisibilityCheckBox {
outline: none;
outline: none;
...
...
UI/data/themes/Dark.qss
浏览文件 @
5ea62d5e
...
@@ -715,7 +715,7 @@ LockedCheckBox::indicator:unchecked {
...
@@ -715,7 +715,7 @@ LockedCheckBox::indicator:unchecked {
image: url(:res/images/unlocked.svg);
image: url(:res/images/unlocked.svg);
}
}
/* Visibilty CheckBox */
/* Visibil
i
ty CheckBox */
VisibilityCheckBox {
VisibilityCheckBox {
outline: none;
outline: none;
...
...
UI/data/themes/Rachni.qss
浏览文件 @
5ea62d5e
...
@@ -1293,7 +1293,7 @@ LockedCheckBox::indicator:unchecked:hover {
...
@@ -1293,7 +1293,7 @@ LockedCheckBox::indicator:unchecked:hover {
image: url(:res/images/unlocked.svg);
image: url(:res/images/unlocked.svg);
}
}
/* Visibilty CheckBox */
/* Visibil
i
ty CheckBox */
VisibilityCheckBox {
VisibilityCheckBox {
outline: none;
outline: none;
...
...
UI/data/themes/System.qss
浏览文件 @
5ea62d5e
...
@@ -186,7 +186,7 @@ LockedCheckBox::indicator:unchecked {
...
@@ -186,7 +186,7 @@ LockedCheckBox::indicator:unchecked {
image: url(:res/images/unlocked.svg);
image: url(:res/images/unlocked.svg);
}
}
/* Visibilty CheckBox */
/* Visibil
i
ty CheckBox */
VisibilityCheckBox {
VisibilityCheckBox {
outline: none;
outline: none;
...
...
UI/volume-control.cpp
浏览文件 @
5ea62d5e
...
@@ -488,7 +488,7 @@ void VolumeMeter::setPeakMeterType(enum obs_peak_meter_type peakMeterType)
...
@@ -488,7 +488,7 @@ void VolumeMeter::setPeakMeterType(enum obs_peak_meter_type peakMeterType)
// processing required by lossy audio compression.
// processing required by lossy audio compression.
//
//
// The alignment level was not specified, but I've adjusted
// The alignment level was not specified, but I've adjusted
// it compared to a sample-peak meter. Incidently Youtube
// it compared to a sample-peak meter. Incident
al
ly Youtube
// uses this new Alignment Level as the maximum integrated
// uses this new Alignment Level as the maximum integrated
// loudness of a video.
// loudness of a video.
//
//
...
...
UI/window-projector.cpp
浏览文件 @
5ea62d5e
...
@@ -591,7 +591,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
...
@@ -591,7 +591,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
gs_matrix_pop
();
gs_matrix_pop
();
}
}
// Region for future usage with aditional info.
// Region for future usage with ad
d
itional info.
if
(
multiviewLayout
==
MultiviewLayout
::
HORIZONTAL_TOP_24_SCENES
)
{
if
(
multiviewLayout
==
MultiviewLayout
::
HORIZONTAL_TOP_24_SCENES
)
{
// Just paint the background for now
// Just paint the background for now
paintAreaWithColor
(
window
->
thickness
,
window
->
thickness
,
paintAreaWithColor
(
window
->
thickness
,
window
->
thickness
,
...
...
cmake/Modules/CopyMSVCBins.cmake
浏览文件 @
5ea62d5e
# Doesn't realy make sense anywhere else
# Doesn't real
l
y make sense anywhere else
if
(
NOT MSVC
)
if
(
NOT MSVC
)
return
()
return
()
endif
()
endif
()
...
@@ -8,7 +8,7 @@ if(COPIED_DEPENDENCIES)
...
@@ -8,7 +8,7 @@ if(COPIED_DEPENDENCIES)
return
()
return
()
endif
()
endif
()
option
(
COPY_DEPENDENCIES
"Automaticaly try copying all dependencies"
ON
)
option
(
COPY_DEPENDENCIES
"Automatical
l
y try copying all dependencies"
ON
)
if
(
NOT COPY_DEPENDENCIES
)
if
(
NOT COPY_DEPENDENCIES
)
return
()
return
()
endif
()
endif
()
...
...
cmake/Modules/FindFFmpeg.cmake
浏览文件 @
5ea62d5e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#
#
# FFMPEG_FOUND - All required components and the core library were found
# FFMPEG_FOUND - All required components and the core library were found
# FFMPEG_INCLUDE_DIRS - Combined list of all components include dirs
# FFMPEG_INCLUDE_DIRS - Combined list of all components include dirs
# FFMPEG_LIBRARIES - Combined list of all componen
e
ts libraries
# FFMPEG_LIBRARIES - Combined list of all components libraries
# FFMPEG_VERSION_STRING - Version of the first component requested
# FFMPEG_VERSION_STRING - Version of the first component requested
#
#
# For each requested component the following variables are defined:
# For each requested component the following variables are defined:
...
...
deps/obs-scripting/CMakeLists.txt
浏览文件 @
5ea62d5e
...
@@ -70,7 +70,7 @@ if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
...
@@ -70,7 +70,7 @@ if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
return
()
return
()
endif
()
endif
()
set
(
SCRIPTING_ENABLED ON CACHE BOOL
"Interal global cmake variable"
FORCE
)
set
(
SCRIPTING_ENABLED ON CACHE BOOL
"Inter
n
al global cmake variable"
FORCE
)
if
(
UI_ENABLED
)
if
(
UI_ENABLED
)
set
(
EXTRA_LIBS obs-frontend-api
)
set
(
EXTRA_LIBS obs-frontend-api
)
...
...
docs/sphinx/frontends.rst
浏览文件 @
5ea62d5e
...
@@ -98,7 +98,7 @@ save/load individual sources manually by using
...
@@ -98,7 +98,7 @@ save/load individual sources manually by using
:c:func:`obs_save_source()` and :c:func:`obs_load_source()`.
:c:func:`obs_save_source()` and :c:func:`obs_load_source()`.
*(Author's note: I should not have written those helper functions; the
*(Author's note: I should not have written those helper functions; the
downside is I had to add "private" sources that aren't savable via the*
downside is I had to add "private" sources that aren't sav
e
able via the*
:c:func:`obs_source_create_private()` *function. Just one of the many
:c:func:`obs_source_create_private()` *function. Just one of the many
minor design flaws that can occur during long-term development.)*
minor design flaws that can occur during long-term development.)*
...
...
docs/sphinx/reference-libobs-graphics-graphics.rst
浏览文件 @
5ea62d5e
...
@@ -826,7 +826,7 @@ Draw Functions
...
@@ -826,7 +826,7 @@ Draw Functions
Gets the current viewport
Gets the current viewport
:param rect: Pointer to rec
ie
ve viewport rectangle
:param rect: Pointer to rec
ei
ve viewport rectangle
---------------------
---------------------
...
...
docs/sphinx/reference-libobs-graphics-vec2.rst
浏览文件 @
5ea62d5e
...
@@ -249,5 +249,5 @@
...
@@ -249,5 +249,5 @@
Normalizes a vector
Normalizes a vector
:param dst: Desination
:param dst: Des
t
ination
:param v: Vector to normalize
:param v: Vector to normalize
docs/sphinx/reference-libobs-graphics-vec3.rst
浏览文件 @
5ea62d5e
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
Normalizes a vector
Normalizes a vector
:param dst: Desination
:param dst: Des
t
ination
:param v: Vector to normalize
:param v: Vector to normalize
---------------------
---------------------
...
...
docs/sphinx/reference-libobs-graphics-vec4.rst
浏览文件 @
5ea62d5e
...
@@ -268,7 +268,7 @@
...
@@ -268,7 +268,7 @@
Normalizes a vector
Normalizes a vector
:param dst: Desination
:param dst: Des
t
ination
:param v: Vector to normalize
:param v: Vector to normalize
---------------------
---------------------
...
...
docs/sphinx/reference-libobs-util-darray.rst
浏览文件 @
5ea62d5e
...
@@ -95,7 +95,7 @@ dynamic array value with a reference (&) operator. For example:
...
@@ -95,7 +95,7 @@ dynamic array value with a reference (&) operator. For example:
.. function:: void da_copy(da_dst, da_src)
.. function:: void da_copy(da_dst, da_src)
Makes a copy of a dy
an
mic array.
Makes a copy of a dy
na
mic array.
:param da_dst: The dynamic array to copy to
:param da_dst: The dynamic array to copy to
:param da_src: The dynamic array to copy from
:param da_src: The dynamic array to copy from
...
...
docs/sphinx/reference-libobs-util-dstr.rst
浏览文件 @
5ea62d5e
...
@@ -188,7 +188,7 @@ Dynamic String Functions
...
@@ -188,7 +188,7 @@ Dynamic String Functions
Copies a specific number of characters from another dynamic string.
Copies a specific number of characters from another dynamic string.
:param dst: Dynamic string
:param dst: Dynamic string
:param src: Dynamic tring to copy
:param src: Dynamic
s
tring to copy
:param len: Number of characters to copy
:param len: Number of characters to copy
----------------------
----------------------
...
@@ -234,7 +234,7 @@ Dynamic String Functions
...
@@ -234,7 +234,7 @@ Dynamic String Functions
.. function:: void dstr_cat_dstr(struct dstr *dst, const struct dstr *str)
.. function:: void dstr_cat_dstr(struct dstr *dst, const struct dstr *str)
Concatenates a dy
an
mic string with another dynamic string.
Concatenates a dy
na
mic string with another dynamic string.
:param dst: Dynamic string to concatenate to
:param dst: Dynamic string to concatenate to
:param str: Dynamic string to concatenate with
:param str: Dynamic string to concatenate with
...
@@ -308,7 +308,7 @@ Dynamic String Functions
...
@@ -308,7 +308,7 @@ Dynamic String Functions
Removes a specific number of characters starting from a specific
Removes a specific number of characters starting from a specific
index.
index.
:param dst: Dy
an
mic string
:param dst: Dy
na
mic string
:param idx: Index to start removing characters at
:param idx: Index to start removing characters at
:param count: Number of characters to remove
:param count: Number of characters to remove
...
...
docs/sphinx/reference-libobs-util-platform.rst
浏览文件 @
5ea62d5e
...
@@ -355,7 +355,7 @@ Other Path/File Functions
...
@@ -355,7 +355,7 @@ Other Path/File Functions
.. function:: int os_copyfile(const char *file_in, const char *file_out)
.. function:: int os_copyfile(const char *file_in, const char *file_out)
Cop
y
s a file.
Cop
ie
s a file.
---------------------
---------------------
...
...
docs/sphinx/reference-libobs-util-profiler.rst
浏览文件 @
5ea62d5e
...
@@ -159,7 +159,7 @@ Profiler Data Access Functions
...
@@ -159,7 +159,7 @@ Profiler Data Access Functions
:param snap: A profiler snapshot
:param snap: A profiler snapshot
:param filename: The path to the CSV file to save
:param filename: The path to the CSV file to save
:return: *true* if successfuly written, *false* otherwise
:return: *true* if successful
l
y written, *false* otherwise
----------------------
----------------------
...
@@ -169,7 +169,7 @@ Profiler Data Access Functions
...
@@ -169,7 +169,7 @@ Profiler Data Access Functions
:param snap: A profiler snapshot
:param snap: A profiler snapshot
:param filename: The path to the gzipped CSV file to save
:param filename: The path to the gzipped CSV file to save
:return: *true* if successfuly written, *false* otherwise
:return: *true* if successful
l
y written, *false* otherwise
----------------------
----------------------
...
...
docs/sphinx/reference-libobs-util-threading.rst
浏览文件 @
5ea62d5e
...
@@ -73,7 +73,7 @@ Event Functions
...
@@ -73,7 +73,7 @@ Event Functions
- 0 - successful
- 0 - successful
- ETIMEDOUT - Timed out
- ETIMEDOUT - Timed out
- EINVAL - An unexpected error occured
- EINVAL - An unexpected error occur
r
ed
----------------------
----------------------
...
@@ -86,7 +86,7 @@ Event Functions
...
@@ -86,7 +86,7 @@ Event Functions
- 0 - successful
- 0 - successful
- EAGAIN - The event is not signaled
- EAGAIN - The event is not signaled
- EINVAL - An unexpected error occured
- EINVAL - An unexpected error occur
r
ed
----------------------
----------------------
...
@@ -123,7 +123,7 @@ Semaphore Functions
...
@@ -123,7 +123,7 @@ Semaphore Functions
.. function:: void os_sem_destroy(os_sem_t *sem)
.. function:: void os_sem_destroy(os_sem_t *sem)
Destroys a sem
pa
hore object.
Destroys a sem
ap
hore object.
:param sem: Semaphore object
:param sem: Semaphore object
...
@@ -140,7 +140,7 @@ Semaphore Functions
...
@@ -140,7 +140,7 @@ Semaphore Functions
.. function:: int os_sem_wait(os_sem_t *sem)
.. function:: int os_sem_wait(os_sem_t *sem)
Decrements the semphore or waits until the semaphore has been
Decrements the sem
a
phore or waits until the semaphore has been
incremented.
incremented.
:param sem: Semaphore object
:param sem: Semaphore object
...
...
docs/sphinx/reference-modules.rst
浏览文件 @
5ea62d5e
...
@@ -98,7 +98,7 @@ to communicate with libobs and front-ends.
...
@@ -98,7 +98,7 @@ to communicate with libobs and front-ends.
Module Externs
Module Externs
--------------
--------------
These functions are externs that are us
e
able throughout the module.
These functions are externs that are usable throughout the module.
.. function:: const char *obs_module_text(const char *lookup_string)
.. function:: const char *obs_module_text(const char *lookup_string)
...
...
docs/sphinx/reference-outputs.rst
浏览文件 @
5ea62d5e
...
@@ -122,7 +122,7 @@ Output Definition Structure (obs_output_info)
...
@@ -122,7 +122,7 @@ Output Definition Structure (obs_output_info)
.. member:: void (*obs_output_info.raw_audio)(void *data, struct audio_data *frames)
.. member:: void (*obs_output_info.raw_audio)(void *data, struct audio_data *frames)
This is called when the output rec
ie
ves raw audio data. Only applies
This is called when the output rec
ei
ves raw audio data. Only applies
to outputs that are not encoded.
to outputs that are not encoded.
**This callback must be used with single-track raw outputs.**
**This callback must be used with single-track raw outputs.**
...
@@ -131,7 +131,7 @@ Output Definition Structure (obs_output_info)
...
@@ -131,7 +131,7 @@ Output Definition Structure (obs_output_info)
.. member:: void (*obs_output_info.raw_audio2)(void *data, size_t idx, struct audio_data *frames)
.. member:: void (*obs_output_info.raw_audio2)(void *data, size_t idx, struct audio_data *frames)
This is called when the output rec
ie
ves raw audio data. Only applies
This is called when the output rec
ei
ves raw audio data. Only applies
to outputs that are not encoded.
to outputs that are not encoded.
**This callback must be used with multi-track raw outputs.**
**This callback must be used with multi-track raw outputs.**
...
@@ -251,7 +251,7 @@ Output Signals
...
@@ -251,7 +251,7 @@ Output Signals
:Parameters: - **code** - Can be one of the following values:
:Parameters: - **code** - Can be one of the following values:
| OBS_OUTPUT_SUCCESS - Successfuly stopped
| OBS_OUTPUT_SUCCESS - Successful
l
y stopped
| OBS_OUTPUT_BAD_PATH - The specified path was invalid
| OBS_OUTPUT_BAD_PATH - The specified path was invalid
| OBS_OUTPUT_CONNECT_FAILED - Failed to connect to a server
| OBS_OUTPUT_CONNECT_FAILED - Failed to connect to a server
| OBS_OUTPUT_INVALID_STREAM - Invalid stream path
| OBS_OUTPUT_INVALID_STREAM - Invalid stream path
...
@@ -368,7 +368,7 @@ General Output Functions
...
@@ -368,7 +368,7 @@ General Output Functions
Starts the output.
Starts the output.
:return: *true* if output successfuly started, *false* otherwise. If
:return: *true* if output successful
l
y started, *false* otherwise. If
the output failed to start,
the output failed to start,
:c:func:`obs_output_get_last_error()` may contain a specific
:c:func:`obs_output_get_last_error()` may contain a specific
error string related to the reason
error string related to the reason
...
@@ -460,7 +460,7 @@ General Output Functions
...
@@ -460,7 +460,7 @@ General Output Functions
Pause an output (if supported by the output).
Pause an output (if supported by the output).
:return: *true* if the output was paused successfuly, *false*
:return: *true* if the output was paused successful
l
y, *false*
otherwise
otherwise
---------------------
---------------------
...
@@ -818,7 +818,7 @@ Functions used by outputs
...
@@ -818,7 +818,7 @@ Functions used by outputs
to the user
to the user
:param code: | Can be one of the following values:
:param code: | Can be one of the following values:
| OBS_OUTPUT_SUCCESS - Successfuly stopped
| OBS_OUTPUT_SUCCESS - Successful
l
y stopped
| OBS_OUTPUT_BAD_PATH - The specified path was invalid
| OBS_OUTPUT_BAD_PATH - The specified path was invalid
| OBS_OUTPUT_CONNECT_FAILED - Failed to connect to a server
| OBS_OUTPUT_CONNECT_FAILED - Failed to connect to a server
| OBS_OUTPUT_INVALID_STREAM - Invalid stream path
| OBS_OUTPUT_INVALID_STREAM - Invalid stream path
...
...
docs/sphinx/reference-properties.rst
浏览文件 @
5ea62d5e
...
@@ -182,7 +182,7 @@ Property Object Functions
...
@@ -182,7 +182,7 @@ Property Object Functions
- **OBS_COMBO_TYPE_EDITABLE** - Can be edited.
- **OBS_COMBO_TYPE_EDITABLE** - Can be edited.
Only used with string lists.
Only used with string lists.
- **OBS_COMBO_TYPE_LIST** - Not ediable.
- **OBS_COMBO_TYPE_LIST** - Not edi
t
able.
:param format: Can be one of the following values:
:param format: Can be one of the following values:
...
...
docs/sphinx/reference-scenes.rst
浏览文件 @
5ea62d5e
...
@@ -398,7 +398,7 @@ Scene Item Functions
...
@@ -398,7 +398,7 @@ Scene Item Functions
.. function:: void obs_sceneitem_get_box_transform(const obs_sceneitem_t *item, struct matrix4 *transform)
.. function:: void obs_sceneitem_get_box_transform(const obs_sceneitem_t *item, struct matrix4 *transform)
Gets the transform matrix of the scene item used for the bouding box
Gets the transform matrix of the scene item used for the bou
n
ding box
or edges of the scene item.
or edges of the scene item.
---------------------
---------------------
...
...
docs/sphinx/reference-sources.rst
浏览文件 @
5ea62d5e
...
@@ -96,7 +96,7 @@ Source Definition Structure (obs_source_info)
...
@@ -96,7 +96,7 @@ Source Definition Structure (obs_source_info)
user.
user.
When this is used, the source will receive interaction events if
When this is used, the source will receive interaction events if
the
e
se callbacks are provided:
these callbacks are provided:
:c:member:`obs_source_info.mouse_click`,
:c:member:`obs_source_info.mouse_click`,
:c:member:`obs_source_info.mouse_move`,
:c:member:`obs_source_info.mouse_move`,
:c:member:`obs_source_info.mouse_wheel`,
:c:member:`obs_source_info.mouse_wheel`,
...
@@ -286,7 +286,7 @@ Source Definition Structure (obs_source_info)
...
@@ -286,7 +286,7 @@ Source Definition Structure (obs_source_info)
Called to enumerate all active sources being used within this
Called to enumerate all active sources being used within this
source. If the source has children that render audio/video it must
source. If the source has children that render audio/video it must
implement this callback. Only used with sources that have th
a
implement this callback. Only used with sources that have th
e
OBS_SOURCE_COMPOSITE output capability flag.
OBS_SOURCE_COMPOSITE output capability flag.
:param enum_callback: Enumeration callback
:param enum_callback: Enumeration callback
...
@@ -391,14 +391,14 @@ Source Definition Structure (obs_source_info)
...
@@ -391,14 +391,14 @@ Source Definition Structure (obs_source_info)
.. member:: bool (*obs_source_info.audio_render)(void *data, uint64_t *ts_out, struct obs_source_audio_mix *audio_output, uint32_t mixers, size_t channels, size_t sample_rate)
.. member:: bool (*obs_source_info.audio_render)(void *data, uint64_t *ts_out, struct obs_source_audio_mix *audio_output, uint32_t mixers, size_t channels, size_t sample_rate)
Called to render audio of composite sources. Only used with sources
Called to render audio of composite sources. Only used with sources
that have th
a
OBS_SOURCE_COMPOSITE output capability flag.
that have th
e
OBS_SOURCE_COMPOSITE output capability flag.
.. member:: void (*obs_source_info.enum_all_sources)(void *data, obs_source_enum_proc_t enum_callback, void *param)
.. member:: void (*obs_source_info.enum_all_sources)(void *data, obs_source_enum_proc_t enum_callback, void *param)
Called to enumerate all active and inactive sources being used
Called to enumerate all active and inactive sources being used
within this source. If this callback isn't implemented,
within this source. If this callback isn't implemented,
enum_active_sources will be called instead. Only used with sources
enum_active_sources will be called instead. Only used with sources
that have th
a
OBS_SOURCE_COMPOSITE output capability flag.
that have th
e
OBS_SOURCE_COMPOSITE output capability flag.
This is typically used if a source can have inactive child sources.
This is typically used if a source can have inactive child sources.
...
@@ -836,7 +836,7 @@ General Source Functions
...
@@ -836,7 +836,7 @@ General Source Functions
.. function:: bool obs_source_active(const obs_source_t *source)
.. function:: bool obs_source_active(const obs_source_t *source)
:return: *true* if active, *false* if not. A source is only
:return: *true* if active, *false* if not. A source is only
cons
di
ered active if it's being shown on the final mix
cons
id
ered active if it's being shown on the final mix
---------------------
---------------------
...
@@ -1268,8 +1268,8 @@ Transitions
...
@@ -1268,8 +1268,8 @@ Transitions
Sets/gets the scale type for sources within the transition.
Sets/gets the scale type for sources within the transition.
:param type: | OBS_TRANSITION_SCALE_MAX_ONLY - Scale to aspect ratio, but only to the maximum size of each source
:param type: | OBS_TRANSITION_SCALE_MAX_ONLY - Scale to aspect ratio, but only to the maximum size of each source
| OBS_TRANSITION_SCALE_ASPECT - Alwa
sy
scale the sources, but keep aspect ratio
| OBS_TRANSITION_SCALE_ASPECT - Alwa
ys
scale the sources, but keep aspect ratio
| OBS_TRANSITION_SCALE_STRETCH - Scale and stretch the sources to the size of the transi
s
ion
| OBS_TRANSITION_SCALE_STRETCH - Scale and stretch the sources to the size of the transi
t
ion
---------------------
---------------------
...
...
libobs/audio-monitoring/pulse/pulseaudio-output.c
浏览文件 @
5ea62d5e
...
@@ -287,7 +287,7 @@ static void pulseaudio_source_info(pa_context *c, const pa_source_info *i,
...
@@ -287,7 +287,7 @@ static void pulseaudio_source_info(pa_context *c, const pa_source_info *i,
{
{
UNUSED_PARAMETER
(
c
);
UNUSED_PARAMETER
(
c
);
PULSE_DATA
(
userdata
);
PULSE_DATA
(
userdata
);
// An error occured
// An error occur
r
ed
if
(
eol
<
0
)
{
if
(
eol
<
0
)
{
data
->
format
=
PA_SAMPLE_INVALID
;
data
->
format
=
PA_SAMPLE_INVALID
;
goto
skip
;
goto
skip
;
...
...
libobs/audio-monitoring/pulse/pulseaudio-wrapper.h
浏览文件 @
5ea62d5e
...
@@ -79,7 +79,7 @@ void pulseaudio_wait();
...
@@ -79,7 +79,7 @@ void pulseaudio_wait();
/**
/**
* Wait for accept signal from calling thread
* Wait for accept signal from calling thread
*
*
* This function tells the pulseaudio mainloop wheter the data provided to
* This function tells the pulseaudio mainloop whet
h
er the data provided to
* the callback should be retained until the calling thread executes
* the callback should be retained until the calling thread executes
* pulseaudio_accept()
* pulseaudio_accept()
*
*
...
...
libobs/graphics/libnsgif/libnsgif.c
浏览文件 @
5ea62d5e
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
'buffer_position' should initially be 0, and will be internally updated
'buffer_position' should initially be 0, and will be internally updated
as the decoding commences. The caller should then repeatedly call
as the decoding commences. The caller should then repeatedly call
gif_initialise() with the structure until the function returns 1, or
gif_initialise() with the structure until the function returns 1, or
no more data is ava
li
able.
no more data is ava
il
able.
Once the initialisation has begun, the decoder completes the variables
Once the initialisation has begun, the decoder completes the variables
'frame_count' and 'frame_count_partial'. The former being the total
'frame_count' and 'frame_count_partial'. The former being the total
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
the current 'frame_image' to reflect the desired frame. The required
the current 'frame_image' to reflect the desired frame. The required
'disposal_method' is also updated to reflect how the frame should be
'disposal_method' is also updated to reflect how the frame should be
plotted. The caller must not assume that the current 'frame_image' will
plotted. The caller must not assume that the current 'frame_image' will
be valid between calls if initialisation is still occuring, and should
be valid between calls if initialisation is still occur
r
ing, and should
either always request that the frame is decoded (no processing will
either always request that the frame is decoded (no processing will
occur if the 'decoded_frame' has not been invalidated by initialisation)
occur if the 'decoded_frame' has not been invalidated by initialisation)
or perform the check itself.
or perform the check itself.
...
...
libobs/graphics/libnsgif/libnsgif.h
浏览文件 @
5ea62d5e
...
@@ -51,7 +51,7 @@ typedef struct gif_frame {
...
@@ -51,7 +51,7 @@ typedef struct gif_frame {
bool
opaque
;
/**< whether the frame is totally opaque */
bool
opaque
;
/**< whether the frame is totally opaque */
bool
redraw_required
;
/**< whether a forcable screen redraw is required */
bool
redraw_required
;
/**< whether a forcable screen redraw is required */
unsigned
char
disposal_method
;
/**< how the previous frame should be disposed; affects plotting */
unsigned
char
disposal_method
;
/**< how the previous frame should be disposed; affects plotting */
bool
transparency
;
/**< whether we acknoledge transparency */
bool
transparency
;
/**< whether we ackno
w
ledge transparency */
unsigned
char
transparency_index
;
/**< the index designating a transparent pixel */
unsigned
char
transparency_index
;
/**< the index designating a transparent pixel */
unsigned
int
redraw_x
;
/**< x co-ordinate of redraw rectangle */
unsigned
int
redraw_x
;
/**< x co-ordinate of redraw rectangle */
unsigned
int
redraw_y
;
/**< y co-ordinate of redraw rectangle */
unsigned
int
redraw_y
;
/**< y co-ordinate of redraw rectangle */
...
@@ -78,7 +78,7 @@ typedef struct gif_bitmap_callback_vt {
...
@@ -78,7 +78,7 @@ typedef struct gif_bitmap_callback_vt {
*/
*/
gif_bitmap_cb_set_opaque
bitmap_set_opaque
;
/**< Sets whether a bitmap should be plotted opaque. */
gif_bitmap_cb_set_opaque
bitmap_set_opaque
;
/**< Sets whether a bitmap should be plotted opaque. */
gif_bitmap_cb_test_opaque
bitmap_test_opaque
;
/**< Tests whether a bitmap has an opaque alpha channel. */
gif_bitmap_cb_test_opaque
bitmap_test_opaque
;
/**< Tests whether a bitmap has an opaque alpha channel. */
gif_bitmap_cb_modified
bitmap_modified
;
/**< The bitmap image has changed, so flush any persist
a
nt cache. */
gif_bitmap_cb_modified
bitmap_modified
;
/**< The bitmap image has changed, so flush any persist
e
nt cache. */
}
gif_bitmap_callback_vt
;
}
gif_bitmap_callback_vt
;
/* The GIF animation data
/* The GIF animation data
...
@@ -87,7 +87,7 @@ typedef struct gif_animation {
...
@@ -87,7 +87,7 @@ typedef struct gif_animation {
gif_bitmap_callback_vt
bitmap_callbacks
;
/**< callbacks for bitmap functions */
gif_bitmap_callback_vt
bitmap_callbacks
;
/**< callbacks for bitmap functions */
unsigned
char
*
gif_data
;
/**< pointer to GIF data */
unsigned
char
*
gif_data
;
/**< pointer to GIF data */
unsigned
int
width
;
/**< width of GIF (may increase during decoding) */
unsigned
int
width
;
/**< width of GIF (may increase during decoding) */
unsigned
int
height
;
/**< heig
th
of GIF (may increase during decoding) */
unsigned
int
height
;
/**< heig
ht
of GIF (may increase during decoding) */
unsigned
int
frame_count
;
/**< number of frames decoded */
unsigned
int
frame_count
;
/**< number of frames decoded */
unsigned
int
frame_count_partial
;
/**< number of frames partially decoded */
unsigned
int
frame_count_partial
;
/**< number of frames partially decoded */
gif_frame
*
frames
;
/**< decoded frames */
gif_frame
*
frames
;
/**< decoded frames */
...
...
libobs/obs-service.h
浏览文件 @
5ea62d5e
...
@@ -52,7 +52,7 @@ struct obs_service_info {
...
@@ -52,7 +52,7 @@ struct obs_service_info {
*
*
* @param data Internal service data
* @param data Internal service data
* @param output Output context
* @param output Output context
* @
eturn
true to allow the output to start up,
* @
return
true to allow the output to start up,
* false to prevent output from starting up
* false to prevent output from starting up
*/
*/
bool
(
*
initialize
)(
void
*
data
,
obs_output_t
*
output
);
bool
(
*
initialize
)(
void
*
data
,
obs_output_t
*
output
);
...
...
libobs/obs-ui.h
浏览文件 @
5ea62d5e
...
@@ -46,7 +46,7 @@ struct obs_modal_ui {
...
@@ -46,7 +46,7 @@ struct obs_modal_ui {
* Callback to execute modal interface.
* Callback to execute modal interface.
*
*
* The @b object variable points to the input/output/encoder/etc. The
* The @b object variable points to the input/output/encoder/etc. The
* @b ui_data var
ai
ble points to the UI parent or UI-specific data to
* @b ui_data var
ia
ble points to the UI parent or UI-specific data to
* be used with the custom user interface.
* be used with the custom user interface.
*
*
* What @b ui_data points to differs depending on the target, and you
* What @b ui_data points to differs depending on the target, and you
...
...
libobs/obs.h
浏览文件 @
5ea62d5e
...
@@ -317,7 +317,7 @@ EXPORT uint32_t obs_get_version(void);
...
@@ -317,7 +317,7 @@ EXPORT uint32_t obs_get_version(void);
EXPORT
const
char
*
obs_get_version_string
(
void
);
EXPORT
const
char
*
obs_get_version_string
(
void
);
/**
/**
* Sets things up for calls to obs_get_cmdline_args. Called onl
y
once at startup
* Sets things up for calls to obs_get_cmdline_args. Called onl
y
once at startup
* and safely copies argv/argc from main(). Subsequent calls do nothing.
* and safely copies argv/argc from main(). Subsequent calls do nothing.
*
*
* @param argc The count of command line arguments, from main()
* @param argc The count of command line arguments, from main()
...
@@ -1489,7 +1489,7 @@ EXPORT obs_scene_t *obs_sceneitem_get_scene(const obs_sceneitem_t *item);
...
@@ -1489,7 +1489,7 @@ EXPORT obs_scene_t *obs_sceneitem_get_scene(const obs_sceneitem_t *item);
EXPORT
obs_source_t
*
obs_sceneitem_get_source
(
const
obs_sceneitem_t
*
item
);
EXPORT
obs_source_t
*
obs_sceneitem_get_source
(
const
obs_sceneitem_t
*
item
);
/* FIXME: The following functions should be deprecated and replaced with a way
/* FIXME: The following functions should be deprecated and replaced with a way
* to specify savable private user data. -Jim */
* to specify sav
e
able private user data. -Jim */
EXPORT
void
obs_sceneitem_select
(
obs_sceneitem_t
*
item
,
bool
select
);
EXPORT
void
obs_sceneitem_select
(
obs_sceneitem_t
*
item
,
bool
select
);
EXPORT
bool
obs_sceneitem_selected
(
const
obs_sceneitem_t
*
item
);
EXPORT
bool
obs_sceneitem_selected
(
const
obs_sceneitem_t
*
item
);
EXPORT
bool
obs_sceneitem_locked
(
const
obs_sceneitem_t
*
item
);
EXPORT
bool
obs_sceneitem_locked
(
const
obs_sceneitem_t
*
item
);
...
...
plugins/CMakeLists.txt
浏览文件 @
5ea62d5e
...
@@ -53,13 +53,13 @@ if(WIN32 OR APPLE)
...
@@ -53,13 +53,13 @@ if(WIN32 OR APPLE)
if
(
BUILD_BROWSER
)
if
(
BUILD_BROWSER
)
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-browser/CMakeLists.txt"
)
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-browser/CMakeLists.txt"
)
add_subdirectory
(
obs-browser
)
add_subdirectory
(
obs-browser
)
set
(
BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL
"Interal global cmake variable"
FORCE
)
set
(
BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL
"Inter
n
al global cmake variable"
FORCE
)
else
()
else
()
message
(
STATUS
"obs-browser submodule not found! Please fetch submodules. obs-browser plugin disabled."
)
message
(
STATUS
"obs-browser submodule not found! Please fetch submodules. obs-browser plugin disabled."
)
set
(
BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL
"Interal global cmake variable"
FORCE
)
set
(
BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL
"Inter
n
al global cmake variable"
FORCE
)
endif
()
endif
()
else
()
else
()
set
(
BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL
"Interal global cmake variable"
FORCE
)
set
(
BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL
"Inter
n
al global cmake variable"
FORCE
)
endif
()
endif
()
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-vst/CMakeLists.txt"
)
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-vst/CMakeLists.txt"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录