Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
2ea50cab
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,发现更多精彩内容 >>
提交
2ea50cab
编写于
6月 25, 2014
作者:
J
Jim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #124 from jp9000/new-locale-handling
Update to new module locale API
上级
070f6cb6
1abf9157
变更
46
隐藏空白更改
内联
并排
Showing
46 changed file
with
210 addition
and
208 deletion
+210
-208
libobs/obs-encoder.c
libobs/obs-encoder.c
+6
-7
libobs/obs-encoder.h
libobs/obs-encoder.h
+2
-4
libobs/obs-internal.h
libobs/obs-internal.h
+3
-0
libobs/obs-module.c
libobs/obs-module.c
+6
-1
libobs/obs-module.h
libobs/obs-module.h
+5
-6
libobs/obs-output.c
libobs/obs-output.c
+6
-6
libobs/obs-output.h
libobs/obs-output.h
+2
-2
libobs/obs-properties.c
libobs/obs-properties.c
+5
-12
libobs/obs-properties.h
libobs/obs-properties.h
+3
-5
libobs/obs-scene.c
libobs/obs-scene.c
+1
-2
libobs/obs-service.c
libobs/obs-service.c
+6
-7
libobs/obs-service.h
libobs/obs-service.h
+2
-2
libobs/obs-source.c
libobs/obs-source.c
+6
-7
libobs/obs-source.h
libobs/obs-source.h
+2
-4
libobs/obs.c
libobs/obs.c
+27
-3
libobs/obs.h
libobs/obs.h
+29
-24
obs/window-basic-main.cpp
obs/window-basic-main.cpp
+3
-4
obs/window-basic-properties.cpp
obs/window-basic-properties.cpp
+2
-2
obs/window-basic-settings.cpp
obs/window-basic-settings.cpp
+4
-6
obs/window-basic-source-select.cpp
obs/window-basic-source-select.cpp
+1
-2
plugins/linux-pulseaudio/pulse-input.c
plugins/linux-pulseaudio/pulse-input.c
+10
-10
plugins/linux-v4l2/v4l2-input.c
plugins/linux-v4l2/v4l2-input.c
+5
-4
plugins/linux-xcomposite/plugin-main.cpp
plugins/linux-xcomposite/plugin-main.cpp
+4
-5
plugins/linux-xcomposite/xcompcap-main.cpp
plugins/linux-xcomposite/xcompcap-main.cpp
+2
-2
plugins/linux-xcomposite/xcompcap-main.h
plugins/linux-xcomposite/xcompcap-main.h
+1
-1
plugins/linux-xshm/xshm-input.c
plugins/linux-xshm/xshm-input.c
+5
-4
plugins/mac-avcapture/av-capture.m
plugins/mac-avcapture/av-capture.m
+3
-4
plugins/mac-capture/mac-audio.c
plugins/mac-capture/mac-audio.c
+8
-10
plugins/obs-ffmpeg/obs-ffmpeg-aac.c
plugins/obs-ffmpeg/obs-ffmpeg-aac.c
+4
-4
plugins/obs-ffmpeg/obs-ffmpeg-output.c
plugins/obs-ffmpeg/obs-ffmpeg-output.c
+2
-2
plugins/obs-libfdk/obs-libfdk.c
plugins/obs-libfdk/obs-libfdk.c
+4
-4
plugins/obs-outputs/flv-output.c
plugins/obs-outputs/flv-output.c
+4
-4
plugins/obs-outputs/rtmp-stream.c
plugins/obs-outputs/rtmp-stream.c
+3
-4
plugins/obs-x264/obs-x264.c
plugins/obs-x264/obs-x264.c
+3
-4
plugins/rtmp-services/rtmp-common.c
plugins/rtmp-services/rtmp-common.c
+3
-5
plugins/rtmp-services/rtmp-custom.c
plugins/rtmp-services/rtmp-custom.c
+3
-5
plugins/win-capture/monitor-capture.c
plugins/win-capture/monitor-capture.c
+2
-2
plugins/win-capture/window-capture.c
plugins/win-capture/window-capture.c
+3
-4
plugins/win-dshow/win-dshow.cpp
plugins/win-dshow/win-dshow.cpp
+4
-4
plugins/win-wasapi/win-wasapi.cpp
plugins/win-wasapi/win-wasapi.cpp
+8
-8
test/osx/test.mm
test/osx/test.mm
+1
-1
test/test-input/test-desktop.m
test/test-input/test-desktop.m
+3
-4
test/test-input/test-filter.c
test/test-input/test-filter.c
+1
-2
test/test-input/test-random.c
test/test-input/test-random.c
+1
-2
test/test-input/test-sinewave.c
test/test-input/test-sinewave.c
+1
-2
test/win/test.cpp
test/win/test.cpp
+1
-1
未找到文件。
libobs/obs-encoder.c
浏览文件 @
2ea50cab
...
...
@@ -30,10 +30,10 @@ static inline struct obs_encoder_info *get_encoder_info(const char *id)
return
NULL
;
}
const
char
*
obs_encoder_getdisplayname
(
const
char
*
id
,
const
char
*
locale
)
const
char
*
obs_encoder_getdisplayname
(
const
char
*
id
)
{
struct
obs_encoder_info
*
ei
=
get_encoder_info
(
id
);
return
ei
?
ei
->
getname
(
locale
)
:
NULL
;
return
ei
?
ei
->
getname
()
:
NULL
;
}
static
bool
init_encoder
(
struct
obs_encoder
*
encoder
,
const
char
*
name
,
...
...
@@ -227,14 +227,14 @@ obs_data_t obs_encoder_defaults(const char *id)
return
(
info
)
?
get_defaults
(
info
)
:
NULL
;
}
obs_properties_t
obs_get_encoder_properties
(
const
char
*
id
,
const
char
*
locale
)
obs_properties_t
obs_get_encoder_properties
(
const
char
*
id
)
{
const
struct
obs_encoder_info
*
ei
=
get_encoder_info
(
id
);
if
(
ei
&&
ei
->
properties
)
{
obs_data_t
defaults
=
get_defaults
(
ei
);
obs_properties_t
properties
;
properties
=
ei
->
properties
(
locale
);
properties
=
ei
->
properties
();
obs_properties_apply_settings
(
properties
,
defaults
);
obs_data_release
(
defaults
);
return
properties
;
...
...
@@ -242,12 +242,11 @@ obs_properties_t obs_get_encoder_properties(const char *id, const char *locale)
return
NULL
;
}
obs_properties_t
obs_encoder_properties
(
obs_encoder_t
encoder
,
const
char
*
locale
)
obs_properties_t
obs_encoder_properties
(
obs_encoder_t
encoder
)
{
if
(
encoder
&&
encoder
->
info
.
properties
)
{
obs_properties_t
props
;
props
=
encoder
->
info
.
properties
(
locale
);
props
=
encoder
->
info
.
properties
();
obs_properties_apply_settings
(
props
,
encoder
->
context
.
settings
);
return
props
;
}
...
...
libobs/obs-encoder.h
浏览文件 @
2ea50cab
...
...
@@ -102,10 +102,9 @@ struct obs_encoder_info {
/**
* Gets the full translated name of this encoder
*
* @param locale Locale to use for translation
* @return Translated name of the encoder
*/
const
char
*
(
*
getname
)(
const
char
*
locale
);
const
char
*
(
*
getname
)(
void
);
/**
* Creates the encoder with the specified settings
...
...
@@ -155,10 +154,9 @@ struct obs_encoder_info {
/**
* Gets the property information of this encoder
*
* @param locale The locale to translate with
* @return The properties data
*/
obs_properties_t
(
*
properties
)(
const
char
*
locale
);
obs_properties_t
(
*
properties
)(
void
);
/**
* Updates the settings for this encoder (usually used for things like
...
...
libobs/obs-internal.h
浏览文件 @
2ea50cab
...
...
@@ -52,6 +52,7 @@ struct draw_callback {
struct
obs_module
{
char
*
name
;
void
*
module
;
void
(
*
set_locale
)(
const
char
*
locale
);
};
extern
void
free_module
(
struct
obs_module
*
mod
);
...
...
@@ -173,6 +174,8 @@ struct obs_core {
signal_handler_t
signals
;
proc_handler_t
procs
;
char
*
locale
;
/* segmented into multiple sub-structures to keep things a bit more
* clean and organized */
struct
obs_core_video
video
;
...
...
libobs/obs-module.c
浏览文件 @
2ea50cab
...
...
@@ -73,7 +73,12 @@ int obs_load_module(const char *path)
return
errorcode
;
}
mod
.
name
=
bstrdup
(
path
);
mod
.
name
=
bstrdup
(
path
);
mod
.
set_locale
=
os_dlsym
(
mod
.
module
,
"obs_module_set_locale"
);
if
(
mod
.
set_locale
)
mod
.
set_locale
(
obs
->
locale
);
da_push_back
(
obs
->
modules
,
&
mod
);
return
MODULE_SUCCESS
;
}
...
...
libobs/obs-module.h
浏览文件 @
2ea50cab
...
...
@@ -50,6 +50,9 @@ MODULE_EXPORT bool obs_module_load(uint32_t libobs_version);
/** Optional: Called when the module is unloaded. */
MODULE_EXPORT
void
obs_module_unload
(
void
);
/** Called to set the current locale data for the module. */
MODULE_EXPORT
void
obs_module_set_locale
(
const
char
*
locale
);
/**
* Optional: Declares the author(s) of the module
*
...
...
@@ -59,9 +62,5 @@ MODULE_EXPORT void obs_module_unload(void);
MODULE_EXPORT const char *obs_module_author(void); \
const char *obs_module_author(void) {return name;}
/**
* Optional: Declares the author of the module
*
* @param locale Locale to look up the description for.
*/
MODULE_EXPORT
const
char
*
obs_module_description
(
const
char
*
locale
);
/** Optional: Returns a description of the module */
MODULE_EXPORT
const
char
*
obs_module_description
(
void
);
libobs/obs-output.c
浏览文件 @
2ea50cab
...
...
@@ -30,10 +30,10 @@ static inline const struct obs_output_info *find_output(const char *id)
return
NULL
;
}
const
char
*
obs_output_getdisplayname
(
const
char
*
id
,
const
char
*
locale
)
const
char
*
obs_output_getdisplayname
(
const
char
*
id
)
{
const
struct
obs_output_info
*
info
=
find_output
(
id
);
return
(
info
!=
NULL
)
?
info
->
getname
(
locale
)
:
NULL
;
return
(
info
!=
NULL
)
?
info
->
getname
()
:
NULL
;
}
static
const
char
*
output_signals
[]
=
{
...
...
@@ -166,14 +166,14 @@ obs_data_t obs_output_defaults(const char *id)
return
(
info
)
?
get_defaults
(
info
)
:
NULL
;
}
obs_properties_t
obs_get_output_properties
(
const
char
*
id
,
const
char
*
locale
)
obs_properties_t
obs_get_output_properties
(
const
char
*
id
)
{
const
struct
obs_output_info
*
info
=
find_output
(
id
);
if
(
info
&&
info
->
properties
)
{
obs_data_t
defaults
=
get_defaults
(
info
);
obs_properties_t
properties
;
properties
=
info
->
properties
(
locale
);
properties
=
info
->
properties
();
obs_properties_apply_settings
(
properties
,
defaults
);
obs_data_release
(
defaults
);
return
properties
;
...
...
@@ -181,11 +181,11 @@ obs_properties_t obs_get_output_properties(const char *id, const char *locale)
return
NULL
;
}
obs_properties_t
obs_output_properties
(
obs_output_t
output
,
const
char
*
locale
)
obs_properties_t
obs_output_properties
(
obs_output_t
output
)
{
if
(
output
&&
output
->
info
.
properties
)
{
obs_properties_t
props
;
props
=
output
->
info
.
properties
(
locale
);
props
=
output
->
info
.
properties
();
obs_properties_apply_settings
(
props
,
output
->
context
.
settings
);
return
props
;
}
...
...
libobs/obs-output.h
浏览文件 @
2ea50cab
...
...
@@ -31,7 +31,7 @@ struct obs_output_info {
uint32_t
flags
;
const
char
*
(
*
getname
)(
const
char
*
locale
);
const
char
*
(
*
getname
)(
void
);
void
*
(
*
create
)(
obs_data_t
settings
,
obs_output_t
output
);
void
(
*
destroy
)(
void
*
data
);
...
...
@@ -49,7 +49,7 @@ struct obs_output_info {
void
(
*
defaults
)(
obs_data_t
settings
);
obs_properties_t
(
*
properties
)(
const
char
*
locale
);
obs_properties_t
(
*
properties
)(
void
);
void
(
*
pause
)(
void
*
data
);
};
...
...
libobs/obs-properties.c
浏览文件 @
2ea50cab
...
...
@@ -90,7 +90,6 @@ struct obs_property {
};
struct
obs_properties
{
const
char
*
locale
;
void
*
param
;
void
(
*
destroy
)(
void
*
param
);
...
...
@@ -98,12 +97,11 @@ struct obs_properties {
struct
obs_property
**
last
;
};
obs_properties_t
obs_properties_create
(
const
char
*
locale
)
obs_properties_t
obs_properties_create
(
void
)
{
struct
obs_properties
*
props
;
props
=
bzalloc
(
sizeof
(
struct
obs_properties
));
props
->
locale
=
locale
;
props
->
last
=
&
props
->
first_property
;
props
->
last
=
&
props
->
first_property
;
return
props
;
}
...
...
@@ -125,10 +123,10 @@ void *obs_properties_get_param(obs_properties_t props)
return
props
?
props
->
param
:
NULL
;
}
obs_properties_t
obs_properties_create_param
(
const
char
*
locale
,
void
*
param
,
void
(
*
destroy
)(
void
*
param
))
obs_properties_t
obs_properties_create_param
(
void
*
param
,
void
(
*
destroy
)(
void
*
param
))
{
struct
obs_properties
*
props
=
obs_properties_create
(
locale
);
struct
obs_properties
*
props
=
obs_properties_create
();
obs_properties_set_param
(
props
,
param
,
destroy
);
return
props
;
}
...
...
@@ -161,11 +159,6 @@ void obs_properties_destroy(obs_properties_t props)
}
}
const
char
*
obs_properties_locale
(
obs_properties_t
props
)
{
return
props
?
props
->
locale
:
NULL
;
}
obs_property_t
obs_properties_first
(
obs_properties_t
props
)
{
return
(
props
!=
NULL
)
?
props
->
first_property
:
NULL
;
...
...
libobs/obs-properties.h
浏览文件 @
2ea50cab
...
...
@@ -61,17 +61,15 @@ typedef struct obs_property *obs_property_t;
/* ------------------------------------------------------------------------- */
EXPORT
obs_properties_t
obs_properties_create
(
const
char
*
locale
);
EXPORT
obs_properties_t
obs_properties_create_param
(
const
char
*
locale
,
void
*
param
,
void
(
*
destroy
)(
void
*
param
));
EXPORT
obs_properties_t
obs_properties_create
(
void
);
EXPORT
obs_properties_t
obs_properties_create_param
(
void
*
param
,
void
(
*
destroy
)(
void
*
param
));
EXPORT
void
obs_properties_destroy
(
obs_properties_t
props
);
EXPORT
void
obs_properties_set_param
(
obs_properties_t
props
,
void
*
param
,
void
(
*
destroy
)(
void
*
param
));
EXPORT
void
*
obs_properties_get_param
(
obs_properties_t
props
);
EXPORT
const
char
*
obs_properties_locale
(
obs_properties_t
props
);
EXPORT
obs_property_t
obs_properties_first
(
obs_properties_t
props
);
EXPORT
obs_property_t
obs_properties_get
(
obs_properties_t
props
,
...
...
libobs/obs-scene.c
浏览文件 @
2ea50cab
...
...
@@ -43,10 +43,9 @@ static inline void signal_item_remove(struct obs_scene_item *item)
calldata_free
(
&
params
);
}
static
const
char
*
scene_getname
(
const
char
*
locale
)
static
const
char
*
scene_getname
(
void
)
{
/* TODO: locale */
UNUSED_PARAMETER
(
locale
);
return
"Scene"
;
}
...
...
libobs/obs-service.c
浏览文件 @
2ea50cab
...
...
@@ -27,10 +27,10 @@ static inline const struct obs_service_info *find_service(const char *id)
return
NULL
;
}
const
char
*
obs_service_getdisplayname
(
const
char
*
id
,
const
char
*
locale
)
const
char
*
obs_service_getdisplayname
(
const
char
*
id
)
{
const
struct
obs_service_info
*
info
=
find_service
(
id
);
return
(
info
!=
NULL
)
?
info
->
getname
(
locale
)
:
NULL
;
return
(
info
!=
NULL
)
?
info
->
getname
()
:
NULL
;
}
obs_service_t
obs_service_create
(
const
char
*
id
,
const
char
*
name
,
...
...
@@ -112,14 +112,14 @@ obs_data_t obs_service_defaults(const char *id)
return
(
info
)
?
get_defaults
(
info
)
:
NULL
;
}
obs_properties_t
obs_get_service_properties
(
const
char
*
id
,
const
char
*
locale
)
obs_properties_t
obs_get_service_properties
(
const
char
*
id
)
{
const
struct
obs_service_info
*
info
=
find_service
(
id
);
if
(
info
&&
info
->
properties
)
{
obs_data_t
defaults
=
get_defaults
(
info
);
obs_properties_t
properties
;
properties
=
info
->
properties
(
locale
);
properties
=
info
->
properties
();
obs_properties_apply_settings
(
properties
,
defaults
);
obs_data_release
(
defaults
);
return
properties
;
...
...
@@ -127,12 +127,11 @@ obs_properties_t obs_get_service_properties(const char *id, const char *locale)
return
NULL
;
}
obs_properties_t
obs_service_properties
(
obs_service_t
service
,
const
char
*
locale
)
obs_properties_t
obs_service_properties
(
obs_service_t
service
)
{
if
(
service
&&
service
->
info
.
properties
)
{
obs_properties_t
props
;
props
=
service
->
info
.
properties
(
locale
);
props
=
service
->
info
.
properties
();
obs_properties_apply_settings
(
props
,
service
->
context
.
settings
);
return
props
;
}
...
...
libobs/obs-service.h
浏览文件 @
2ea50cab
...
...
@@ -21,7 +21,7 @@ struct obs_service_info {
/* required */
const
char
*
id
;
const
char
*
(
*
getname
)(
const
char
*
locale
);
const
char
*
(
*
getname
)(
void
);
void
*
(
*
create
)(
obs_data_t
settings
,
obs_service_t
service
);
void
(
*
destroy
)(
void
*
data
);
...
...
@@ -33,7 +33,7 @@ struct obs_service_info {
void
(
*
defaults
)(
obs_data_t
settings
);
obs_properties_t
(
*
properties
)(
const
char
*
locale
);
obs_properties_t
(
*
properties
)(
void
);
/**
* Called when getting ready to start up an output, before the encoders
...
...
libobs/obs-source.c
浏览文件 @
2ea50cab
...
...
@@ -95,11 +95,10 @@ bool obs_source_init_context(struct obs_source *source,
source_signals
);
}
const
char
*
obs_source_getdisplayname
(
enum
obs_source_type
type
,
const
char
*
id
,
const
char
*
locale
)
const
char
*
obs_source_getdisplayname
(
enum
obs_source_type
type
,
const
char
*
id
)
{
const
struct
obs_source_info
*
info
=
get_source_info
(
type
,
id
);
return
(
info
!=
NULL
)
?
info
->
getname
(
locale
)
:
NULL
;
return
(
info
!=
NULL
)
?
info
->
getname
()
:
NULL
;
}
/* internal initialization */
...
...
@@ -322,14 +321,14 @@ obs_data_t obs_source_settings(enum obs_source_type type, const char *id)
}
obs_properties_t
obs_get_source_properties
(
enum
obs_source_type
type
,
const
char
*
id
,
const
char
*
locale
)
const
char
*
id
)
{
const
struct
obs_source_info
*
info
=
get_source_info
(
type
,
id
);
if
(
info
&&
info
->
properties
)
{
obs_data_t
defaults
=
get_defaults
(
info
);
obs_properties_t
properties
;
properties
=
info
->
properties
(
locale
);
properties
=
info
->
properties
();
obs_properties_apply_settings
(
properties
,
defaults
);
obs_data_release
(
defaults
);
return
properties
;
...
...
@@ -337,11 +336,11 @@ obs_properties_t obs_get_source_properties(enum obs_source_type type,
return
NULL
;
}
obs_properties_t
obs_source_properties
(
obs_source_t
source
,
const
char
*
locale
)
obs_properties_t
obs_source_properties
(
obs_source_t
source
)
{
if
(
source_valid
(
source
)
&&
source
->
info
.
properties
)
{
obs_properties_t
props
;
props
=
source
->
info
.
properties
(
locale
);
props
=
source
->
info
.
properties
();
obs_properties_apply_settings
(
props
,
source
->
context
.
settings
);
return
props
;
}
...
...
libobs/obs-source.h
浏览文件 @
2ea50cab
...
...
@@ -118,10 +118,9 @@ struct obs_source_info {
/**
* Get the translated name of the source type
*
* @param locale The locale to translate with
* @return The translated name of the source type
*/
const
char
*
(
*
getname
)(
const
char
*
locale
);
const
char
*
(
*
getname
)(
void
);
/**
* Creates the source data for the source
...
...
@@ -161,10 +160,9 @@ struct obs_source_info {
/**
* Gets the property information of this source
*
* @param locale The locale to translate with
* @return The properties data
*/
obs_properties_t
(
*
properties
)(
const
char
*
locale
);
obs_properties_t
(
*
properties
)(
void
);
/**
* Updates the settings for this source
...
...
libobs/obs.c
浏览文件 @
2ea50cab
...
...
@@ -503,7 +503,7 @@ static inline bool obs_init_handlers(void)
extern
const
struct
obs_source_info
scene_info
;
static
bool
obs_init
(
void
)
static
bool
obs_init
(
const
char
*
locale
)
{
obs
=
bzalloc
(
sizeof
(
struct
obs_core
));
...
...
@@ -512,11 +512,12 @@ static bool obs_init(void)
if
(
!
obs_init_handlers
())
return
false
;
obs
->
locale
=
bstrdup
(
locale
);
obs_register_source
(
&
scene_info
);
return
true
;
}
bool
obs_startup
(
void
)
bool
obs_startup
(
const
char
*
locale
)
{
bool
success
;
...
...
@@ -525,7 +526,7 @@ bool obs_startup(void)
return
false
;
}
success
=
obs_init
();
success
=
obs_init
(
locale
);
if
(
!
success
)
obs_shutdown
();
...
...
@@ -559,6 +560,7 @@ void obs_shutdown(void)
free_module
(
obs
->
modules
.
array
+
i
);
da_free
(
obs
->
modules
);
bfree
(
obs
->
locale
);
bfree
(
obs
);
obs
=
NULL
;
}
...
...
@@ -568,6 +570,28 @@ bool obs_initialized(void)
return
obs
!=
NULL
;
}
void
obs_set_locale
(
const
char
*
locale
)
{
if
(
!
obs
)
return
;
if
(
obs
->
locale
)
bfree
(
obs
->
locale
);
obs
->
locale
=
bstrdup
(
locale
);
for
(
size_t
i
=
0
;
i
<
obs
->
modules
.
num
;
i
++
)
{
struct
obs_module
*
module
=
obs
->
modules
.
array
+
i
;
if
(
module
->
set_locale
)
module
->
set_locale
(
locale
);
}
}
const
char
*
obs_get_locale
(
void
)
{
return
obs
?
obs
->
locale
:
NULL
;
}
bool
obs_reset_video
(
struct
obs_video_info
*
ovi
)
{
if
(
!
obs
)
return
false
;
...
...
libobs/obs.h
浏览文件 @
2ea50cab
...
...
@@ -197,8 +197,12 @@ struct source_frame {
/* ------------------------------------------------------------------------- */
/* OBS context */
/** Initializes OBS */
EXPORT
bool
obs_startup
(
void
);
/**
* Initializes OBS
*
* @param locale The locale to use for modules
*/
EXPORT
bool
obs_startup
(
const
char
*
locale
);
/** Releases all data associated with OBS and terminates the OBS context */
EXPORT
void
obs_shutdown
(
void
);
...
...
@@ -206,6 +210,17 @@ EXPORT void obs_shutdown(void);
/** @return true if the main OBS context has been initialized */
EXPORT
bool
obs_initialized
(
void
);
/**
* Sets a new locale to use for modules. This will call obs_module_set_locale
* for each module with the new locale.
*
* @param locale The locale to use for modules
*/
EXPORT
void
obs_set_locale
(
const
char
*
locale
);
/** @return the current locale */
EXPORT
const
char
*
obs_get_locale
(
void
);
/**
* Sets base video ouput base resolution/fps/format
*
...
...
@@ -462,7 +477,7 @@ EXPORT void obs_display_remove_draw_callback(obs_display_t display,
/** Returns the translated display name of a source */
EXPORT
const
char
*
obs_source_getdisplayname
(
enum
obs_source_type
type
,
const
char
*
id
,
const
char
*
locale
);
const
char
*
id
);
/**
* Creates a source of the specified type with the specified settings.
...
...
@@ -497,14 +512,13 @@ EXPORT obs_data_t obs_get_source_defaults(enum obs_source_type type,
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT
obs_properties_t
obs_get_source_properties
(
enum
obs_source_type
type
,
const
char
*
id
,
const
char
*
locale
);
const
char
*
id
);
/**
* Returns the properties list for a specific existing source. Free with
* obs_properties_destroy
*/
EXPORT
obs_properties_t
obs_source_properties
(
obs_source_t
source
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_source_properties
(
obs_source_t
source
);
/** Updates settings for this source */
EXPORT
void
obs_source_update
(
obs_source_t
source
,
obs_data_t
settings
);
...
...
@@ -737,8 +751,7 @@ EXPORT void obs_sceneitem_get_box_transform(obs_sceneitem_t item,
/* ------------------------------------------------------------------------- */
/* Outputs */
EXPORT
const
char
*
obs_output_getdisplayname
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
const
char
*
obs_output_getdisplayname
(
const
char
*
id
);
/**
* Creates an output.
...
...
@@ -763,15 +776,13 @@ EXPORT bool obs_output_active(obs_output_t output);
EXPORT
obs_data_t
obs_output_defaults
(
const
char
*
id
);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT
obs_properties_t
obs_get_output_properties
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_get_output_properties
(
const
char
*
id
);
/**
* Returns the property list of an existing output, if any. Free with
* obs_properties_destroy
*/
EXPORT
obs_properties_t
obs_output_properties
(
obs_output_t
output
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_output_properties
(
obs_output_t
output
);
/** Updates the settings for this output context */
EXPORT
void
obs_output_update
(
obs_output_t
output
,
obs_data_t
settings
);
...
...
@@ -883,8 +894,7 @@ EXPORT void obs_output_signal_stop(obs_output_t output, int code);
/* ------------------------------------------------------------------------- */
/* Encoders */
EXPORT
const
char
*
obs_encoder_getdisplayname
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
const
char
*
obs_encoder_getdisplayname
(
const
char
*
id
);
/**
* Creates a video encoder context
...
...
@@ -918,15 +928,13 @@ EXPORT const char *obs_encoder_get_codec(obs_encoder_t encoder);
EXPORT
obs_data_t
obs_encoder_defaults
(
const
char
*
id
);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT
obs_properties_t
obs_get_encoder_properties
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_get_encoder_properties
(
const
char
*
id
);
/**
* Returns the property list of an existing encoder, if any. Free with
* obs_properties_destroy
*/
EXPORT
obs_properties_t
obs_encoder_properties
(
obs_encoder_t
encoder
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_encoder_properties
(
obs_encoder_t
encoder
);
/**
* Updates the settings of the encoder context. Usually used for changing
...
...
@@ -972,8 +980,7 @@ EXPORT void obs_free_encoder_packet(struct encoder_packet *packet);
/* ------------------------------------------------------------------------- */
/* Stream Services */
EXPORT
const
char
*
obs_service_getdisplayname
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
const
char
*
obs_service_getdisplayname
(
const
char
*
id
);
EXPORT
obs_service_t
obs_service_create
(
const
char
*
id
,
const
char
*
name
,
obs_data_t
settings
);
...
...
@@ -985,15 +992,13 @@ EXPORT const char *obs_service_getname(obs_service_t service);
EXPORT
obs_data_t
obs_service_defaults
(
const
char
*
id
);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT
obs_properties_t
obs_get_service_properties
(
const
char
*
id
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_get_service_properties
(
const
char
*
id
);
/**
* Returns the property list of an existing service context, if any. Free with
* obs_properties_destroy
*/
EXPORT
obs_properties_t
obs_service_properties
(
obs_service_t
service
,
const
char
*
locale
);
EXPORT
obs_properties_t
obs_service_properties
(
obs_service_t
service
);
/** Gets the service type */
EXPORT
const
char
*
obs_service_gettype
(
obs_service_t
service
);
...
...
obs/window-basic-main.cpp
浏览文件 @
2ea50cab
...
...
@@ -210,7 +210,7 @@ static inline bool HasAudioDevices(const char *source_id)
{
const
char
*
output_id
=
source_id
;
obs_properties_t
props
=
obs_get_source_properties
(
OBS_SOURCE_TYPE_INPUT
,
output_id
,
App
()
->
GetLocale
()
);
OBS_SOURCE_TYPE_INPUT
,
output_id
);
size_t
count
=
0
;
if
(
!
props
)
...
...
@@ -468,7 +468,7 @@ void OBSBasic::OBSInit()
show
();
App
()
->
processEvents
();
if
(
!
obs_startup
())
if
(
!
obs_startup
(
App
()
->
GetLocale
()
))
throw
"Failed to initialize libobs"
;
if
(
!
InitBasicConfig
())
throw
"Failed to load basic.ini"
;
...
...
@@ -1299,8 +1299,7 @@ void OBSBasic::AddSourcePopupMenu(const QPoint &pos)
QMenu
popup
;
while
(
obs_enum_input_types
(
idx
++
,
&
type
))
{
const
char
*
name
=
obs_source_getdisplayname
(
OBS_SOURCE_TYPE_INPUT
,
type
,
App
()
->
GetLocale
());
OBS_SOURCE_TYPE_INPUT
,
type
);
if
(
strcmp
(
type
,
"scene"
)
==
0
)
continue
;
...
...
obs/window-basic-properties.cpp
浏览文件 @
2ea50cab
...
...
@@ -44,8 +44,8 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
obs_data_release
(
settings
);
view
=
new
OBSPropertiesView
(
settings
,
obs_source_properties
(
source
,
App
()
->
GetLocale
())
,
source
,
(
PropertiesUpdateCallback
)
obs_source_update
);
obs_source_properties
(
source
),
source
,
(
PropertiesUpdateCallback
)
obs_source_update
);
layout
()
->
addWidget
(
view
);
layout
()
->
setAlignment
(
view
,
Qt
::
AlignBottom
);
...
...
obs/window-basic-settings.cpp
浏览文件 @
2ea50cab
...
...
@@ -212,8 +212,7 @@ void OBSBasicSettings::LoadServiceTypes()
size_t
idx
=
0
;
while
(
obs_enum_service_types
(
idx
++
,
&
type
))
{
const
char
*
name
=
obs_service_getdisplayname
(
type
,
App
()
->
GetLocale
());
const
char
*
name
=
obs_service_getdisplayname
(
type
);
QString
qName
=
QT_UTF8
(
name
);
QString
qType
=
QT_UTF8
(
type
);
...
...
@@ -229,8 +228,7 @@ void OBSBasicSettings::LoadServiceInfo()
QLayout
*
layout
=
ui
->
streamContainer
->
layout
();
obs_service_t
service
=
main
->
GetService
();
obs_data_t
settings
=
obs_service_get_settings
(
service
);
obs_properties_t
properties
=
obs_service_properties
(
service
,
App
()
->
GetLocale
());
obs_properties_t
properties
=
obs_service_properties
(
service
);
delete
streamProperties
;
streamProperties
=
new
OBSPropertiesView
(
...
...
@@ -480,9 +478,9 @@ void OBSBasicSettings::LoadAudioDevices()
const
char
*
output_id
=
App
()
->
OutputAudioSource
();
obs_properties_t
input_props
=
obs_get_source_properties
(
OBS_SOURCE_TYPE_INPUT
,
input_id
,
App
()
->
GetLocale
()
);
OBS_SOURCE_TYPE_INPUT
,
input_id
);
obs_properties_t
output_props
=
obs_get_source_properties
(
OBS_SOURCE_TYPE_INPUT
,
output_id
,
App
()
->
GetLocale
()
);
OBS_SOURCE_TYPE_INPUT
,
output_id
);
if
(
input_props
)
{
obs_property_t
inputs
=
obs_properties_get
(
input_props
,
...
...
obs/window-basic-source-select.cpp
浏览文件 @
2ea50cab
...
...
@@ -169,8 +169,7 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *type_)
ui
->
setupUi
(
this
);
QString
placeHolderText
{
QT_UTF8
(
obs_source_getdisplayname
(
OBS_SOURCE_TYPE_INPUT
,
type_
,
App
()
->
GetLocale
()))};
OBS_SOURCE_TYPE_INPUT
,
type_
))};
QString
text
{
placeHolderText
};
int
i
=
1
;
...
...
plugins/linux-pulseaudio/pulse-input.c
浏览文件 @
2ea50cab
...
...
@@ -281,9 +281,9 @@ skip:
/**
* Get plugin properties
*/
static
obs_properties_t
pulse_properties
(
const
char
*
locale
,
bool
input
)
static
obs_properties_t
pulse_properties
(
bool
input
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
devices
=
obs_properties_add_list
(
props
,
"device_id"
,
"Device"
,
OBS_COMBO_TYPE_LIST
,
OBS_COMBO_FORMAT_STRING
);
...
...
@@ -295,14 +295,14 @@ static obs_properties_t pulse_properties(const char *locale, bool input)
return
props
;
}
static
obs_properties_t
pulse_input_properties
(
const
char
*
locale
)
static
obs_properties_t
pulse_input_properties
(
void
)
{
return
pulse_properties
(
locale
,
true
);
return
pulse_properties
(
true
);
}
static
obs_properties_t
pulse_output_properties
(
const
char
*
locale
)
static
obs_properties_t
pulse_output_properties
(
void
)
{
return
pulse_properties
(
locale
,
false
);
return
pulse_properties
(
false
);
}
/**
...
...
@@ -366,15 +366,15 @@ static void pulse_output_defaults(obs_data_t settings)
/**
* Returns the name of the plugin
*/
static
const
char
*
pulse_input_getname
(
const
char
*
locale
)
static
const
char
*
pulse_input_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Pulse Audio Input Capture"
;
}
static
const
char
*
pulse_output_getname
(
const
char
*
locale
)
static
const
char
*
pulse_output_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Pulse Audio Output Capture"
;
}
...
...
plugins/linux-v4l2/v4l2-input.c
浏览文件 @
2ea50cab
...
...
@@ -266,9 +266,9 @@ exit:
return
NULL
;
}
static
const
char
*
v4l2_getname
(
const
char
*
locale
)
static
const
char
*
v4l2_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"V4L2 Capture Input"
;
}
...
...
@@ -452,9 +452,10 @@ static bool resolution_selected(obs_properties_t props, obs_property_t p,
return
true
;
}
static
obs_properties_t
v4l2_properties
(
const
char
*
locale
)
static
obs_properties_t
v4l2_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
/* TODO: locale */
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
device_list
=
obs_properties_add_list
(
props
,
"device_id"
,
"Device"
,
OBS_COMBO_TYPE_LIST
,
OBS_COMBO_FORMAT_STRING
);
obs_property_t
format_list
=
obs_properties_add_list
(
props
,
...
...
plugins/linux-xcomposite/plugin-main.cpp
浏览文件 @
2ea50cab
...
...
@@ -37,9 +37,9 @@ static uint32_t xcompcap_getheight(void* data)
return
cc
->
height
();
}
static
obs_properties_t
xcompcap_props
(
const
char
*
locale
)
static
obs_properties_t
xcompcap_props
(
void
)
{
return
XCompcapMain
::
properties
(
locale
);
return
XCompcapMain
::
properties
();
}
void
xcompcap_defaults
(
obs_data_t
settings
)
...
...
@@ -55,10 +55,9 @@ void xcompcap_update(void *data, obs_data_t settings)
OBS_DECLARE_MODULE
()
static
const
char
*
xcompcap_getname
(
const
char
*
locale
)
static
const
char
*
xcompcap_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Xcomposite capture"
;
}
...
...
plugins/linux-xcomposite/xcompcap-main.cpp
浏览文件 @
2ea50cab
...
...
@@ -46,9 +46,9 @@ void XCompcapMain::deinit()
XCompcap
::
cleanupDisplay
();
}
obs_properties_t
XCompcapMain
::
properties
(
const
char
*
locale
)
obs_properties_t
XCompcapMain
::
properties
()
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
wins
=
obs_properties_add_list
(
props
,
"capture_window"
,
"Captured Window"
,
OBS_COMBO_TYPE_LIST
,
...
...
plugins/linux-xcomposite/xcompcap-main.h
浏览文件 @
2ea50cab
...
...
@@ -8,7 +8,7 @@ class XCompcapMain
static
bool
init
();
static
void
deinit
();
static
obs_properties_t
properties
(
const
char
*
locale
);
static
obs_properties_t
properties
();
static
void
defaults
(
obs_data_t
settings
);
XCompcapMain
(
obs_data_t
settings
,
obs_source_t
source
);
...
...
plugins/linux-xshm/xshm-input.c
浏览文件 @
2ea50cab
...
...
@@ -108,9 +108,9 @@ static int_fast32_t xshm_update_geometry(struct xshm_data *data,
/**
* Returns the name of the plugin
*/
static
const
char
*
xshm_getname
(
const
char
*
locale
)
static
const
char
*
xshm_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"X11 Shared Memory Screen Input"
;
}
...
...
@@ -154,9 +154,10 @@ static void xshm_defaults(obs_data_t defaults)
/**
* Get the properties for the capture
*/
static
obs_properties_t
xshm_properties
(
const
char
*
locale
)
static
obs_properties_t
xshm_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
/* TODO: locale */
obs_properties_t
props
=
obs_properties_create
();
int_fast32_t
screen_max
;
Display
*
dpy
=
XOpenDisplay
(
NULL
);
...
...
plugins/mac-avcapture/av-capture.m
浏览文件 @
2ea50cab
...
...
@@ -131,10 +131,9 @@ static inline void update_frame_size(struct av_capture *capture,
}
@end
static
const
char
*
av_capture_getname
(
const
char
*
locale
)
static
const
char
*
av_capture_getname
(
void
)
{
/* TODO: locale */
UNUSED_PARAMETER
(
locale
);
return
"Video Capture Device"
;
}
...
...
@@ -569,9 +568,9 @@ static bool properties_device_changed(obs_properties_t props, obs_property_t p,
return
true
;
}
static
obs_properties_t
av_capture_properties
(
char
const
*
locale
)
static
obs_properties_t
av_capture_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
/* TODO: locale */
obs_property_t
dev_list
=
obs_properties_add_list
(
props
,
"device"
,
...
...
plugins/mac-capture/mac-audio.c
浏览文件 @
2ea50cab
...
...
@@ -628,17 +628,15 @@ static void coreaudio_uninit(struct coreaudio_data *ca)
/* ------------------------------------------------------------------------- */
static
const
char
*
coreaudio_input_getname
(
const
char
*
locale
)
static
const
char
*
coreaudio_input_getname
(
void
)
{
/* TODO: Locale */
UNUSED_PARAMETER
(
locale
);
return
"CoreAudio Input Capture"
;
}
static
const
char
*
coreaudio_output_getname
(
const
char
*
locale
)
static
const
char
*
coreaudio_output_getname
(
void
)
{
/* TODO: Locale */
UNUSED_PARAMETER
(
locale
);
return
"CoreAudio Output Capture"
;
}
...
...
@@ -704,9 +702,9 @@ static void *coreaudio_create_output_capture(obs_data_t settings,
return
coreaudio_create
(
settings
,
source
,
false
);
}
static
obs_properties_t
coreaudio_properties
(
const
char
*
locale
,
bool
input
)
static
obs_properties_t
coreaudio_properties
(
bool
input
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
property
;
struct
device_list
devices
;
...
...
@@ -732,14 +730,14 @@ static obs_properties_t coreaudio_properties(const char *locale, bool input)
return
props
;
}
static
obs_properties_t
coreaudio_input_properties
(
const
char
*
locale
)
static
obs_properties_t
coreaudio_input_properties
(
void
)
{
return
coreaudio_properties
(
locale
,
true
);
return
coreaudio_properties
(
true
);
}
static
obs_properties_t
coreaudio_output_properties
(
const
char
*
locale
)
static
obs_properties_t
coreaudio_output_properties
(
void
)
{
return
coreaudio_properties
(
locale
,
false
);
return
coreaudio_properties
(
false
);
}
struct
obs_source_info
coreaudio_input_capture_info
=
{
...
...
plugins/obs-ffmpeg/obs-ffmpeg-aac.c
浏览文件 @
2ea50cab
...
...
@@ -44,9 +44,9 @@ struct aac_encoder {
int
frame_size_bytes
;
};
static
const
char
*
aac_getname
(
const
char
*
locale
)
static
const
char
*
aac_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"FFmpeg Default AAC Encoder"
;
}
...
...
@@ -238,9 +238,9 @@ static void aac_defaults(obs_data_t settings)
obs_data_set_default_int
(
settings
,
"bitrate"
,
128
);
}
static
obs_properties_t
aac_properties
(
const
char
*
locale
)
static
obs_properties_t
aac_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
/* TODO: locale */
obs_properties_add_int
(
props
,
"bitrate"
,
"Bitrate"
,
32
,
320
,
32
);
...
...
plugins/obs-ffmpeg/obs-ffmpeg-output.c
浏览文件 @
2ea50cab
...
...
@@ -396,9 +396,9 @@ fail:
/* ------------------------------------------------------------------------- */
static
const
char
*
ffmpeg_output_getname
(
const
char
*
locale
)
static
const
char
*
ffmpeg_output_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"FFmpeg file output"
;
}
...
...
plugins/obs-libfdk/obs-libfdk.c
浏览文件 @
2ea50cab
...
...
@@ -59,15 +59,15 @@ typedef struct libfdk_encoder {
int
packet_buffer_size
;
}
libfdk_encoder_t
;
static
const
char
*
libfdk_getname
(
const
char
*
locale
)
static
const
char
*
libfdk_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"libfdk aac encoder"
;
}
static
obs_properties_t
libfdk_properties
(
const
char
*
locale
)
static
obs_properties_t
libfdk_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_properties_add_int
(
props
,
"bitrate"
,
"Bitrate"
,
32
,
256
,
32
);
obs_properties_add_bool
(
props
,
"afterburner"
,
"Enable AAC Afterburner"
);
...
...
plugins/obs-outputs/flv-output.c
浏览文件 @
2ea50cab
...
...
@@ -32,9 +32,9 @@ struct flv_output {
int64_t
last_packet_ts
;
};
static
const
char
*
flv_output_getname
(
const
char
*
locale
)
static
const
char
*
flv_output_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"FLV File Output"
;
}
...
...
@@ -189,9 +189,9 @@ static void flv_output_data(void *data, struct encoder_packet *packet)
}
}
static
obs_properties_t
flv_output_properties
(
const
char
*
locale
)
static
obs_properties_t
flv_output_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
/* TODO: locale */
obs_properties_add_text
(
props
,
"path"
,
"File Path"
,
OBS_TEXT_DEFAULT
);
...
...
plugins/obs-outputs/rtmp-stream.c
浏览文件 @
2ea50cab
...
...
@@ -61,10 +61,9 @@ struct rtmp_stream {
RTMP
rtmp
;
};
static
const
char
*
rtmp_stream_getname
(
const
char
*
locale
)
static
const
char
*
rtmp_stream_getname
(
void
)
{
/* TODO: locale stuff */
UNUSED_PARAMETER
(
locale
);
return
"RTMP Stream"
;
}
...
...
@@ -567,9 +566,9 @@ static void rtmp_stream_defaults(obs_data_t defaults)
obs_data_set_default_int
(
defaults
,
"drop_threshold"
,
600000
);
}
static
obs_properties_t
rtmp_stream_properties
(
const
char
*
locale
)
static
obs_properties_t
rtmp_stream_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
/* TODO: locale */
obs_properties_add_text
(
props
,
"path"
,
"Stream URL"
,
OBS_TEXT_DEFAULT
);
...
...
plugins/obs-x264/obs-x264.c
浏览文件 @
2ea50cab
...
...
@@ -38,10 +38,9 @@ struct obs_x264 {
/* ------------------------------------------------------------------------- */
static
const
char
*
obs_x264_getname
(
const
char
*
locale
)
static
const
char
*
obs_x264_getname
(
void
)
{
/* TODO locale lookup */
UNUSED_PARAMETER
(
locale
);
return
"x264"
;
}
...
...
@@ -93,11 +92,11 @@ static inline void add_strings(obs_property_t list, const char *const *strings)
}
}
static
obs_properties_t
obs_x264_props
(
const
char
*
locale
)
static
obs_properties_t
obs_x264_props
(
void
)
{
/* TODO: locale */
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
list
;
obs_properties_add_int
(
props
,
"bitrate"
,
"Bitrate"
,
50
,
100000
,
1
);
...
...
plugins/rtmp-services/rtmp-common.c
浏览文件 @
2ea50cab
...
...
@@ -8,10 +8,8 @@ struct rtmp_common {
char
*
key
;
};
static
const
char
*
rtmp_common_getname
(
const
char
*
locale
)
static
const
char
*
rtmp_common_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Streaming Services"
;
}
...
...
@@ -200,9 +198,9 @@ static bool service_selected(obs_properties_t props, obs_property_t p,
return
true
;
}
static
obs_properties_t
rtmp_common_properties
(
const
char
*
locale
)
static
obs_properties_t
rtmp_common_properties
(
void
)
{
obs_properties_t
ppts
=
obs_properties_create
(
locale
);
obs_properties_t
ppts
=
obs_properties_create
();
obs_property_t
list
;
char
*
file
;
...
...
plugins/rtmp-services/rtmp-custom.c
浏览文件 @
2ea50cab
...
...
@@ -4,10 +4,8 @@ struct rtmp_custom {
char
*
server
,
*
key
;
};
static
const
char
*
rtmp_custom_name
(
const
char
*
locale
)
static
const
char
*
rtmp_custom_name
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Custom Streaming Server"
;
}
...
...
@@ -41,9 +39,9 @@ static void *rtmp_custom_create(obs_data_t settings, obs_service_t service)
return
data
;
}
static
obs_properties_t
rtmp_custom_properties
(
const
char
*
locale
)
static
obs_properties_t
rtmp_custom_properties
(
void
)
{
obs_properties_t
ppts
=
obs_properties_create
(
locale
);
obs_properties_t
ppts
=
obs_properties_create
();
/* TODO: locale */
...
...
plugins/win-capture/monitor-capture.c
浏览文件 @
2ea50cab
...
...
@@ -81,9 +81,9 @@ static inline void update_settings(struct monitor_capture *capture,
/* ------------------------------------------------------------------------- */
static
const
char
*
monitor_capture_getname
(
const
char
*
locale
)
static
const
char
*
monitor_capture_getname
(
void
)
{
/* TODO:
translat
e */
/* TODO:
local
e */
return
"Monitor Capture"
;
}
...
...
plugins/win-capture/window-capture.c
浏览文件 @
2ea50cab
...
...
@@ -294,10 +294,9 @@ static HWND find_window(struct window_capture *wc)
/* ------------------------------------------------------------------------- */
static
const
char
*
wc_getname
(
const
char
*
locale
)
static
const
char
*
wc_getname
(
void
)
{
/* TODO: locale */
UNUSED_PARAMETER
(
locale
);
return
"Window capture"
;
}
...
...
@@ -362,9 +361,9 @@ static void wc_defaults(obs_data_t defaults)
obs_data_setbool
(
defaults
,
"compatibility"
,
false
);
}
static
obs_properties_t
wc_properties
(
const
char
*
locale
)
static
obs_properties_t
wc_properties
(
void
)
{
obs_properties_t
ppts
=
obs_properties_create
(
locale
);
obs_properties_t
ppts
=
obs_properties_create
();
obs_property_t
p
;
/* TODO: locale */
...
...
plugins/win-dshow/win-dshow.cpp
浏览文件 @
2ea50cab
...
...
@@ -251,9 +251,9 @@ void DShowInput::Update(obs_data_t settings)
/* ------------------------------------------------------------------------- */
static
const
char
*
GetDShowInputName
(
const
char
*
locale
)
static
const
char
*
GetDShowInputName
(
void
)
{
UNUSED_PARAMETER
(
locale
);
/* TODO: locale */
return
"Video Capture Device"
;
}
...
...
@@ -778,9 +778,9 @@ static bool DeviceIntervalChanged(obs_properties_t props, obs_property_t p,
return
true
;
}
static
obs_properties_t
GetDShowProperties
(
const
char
*
locale
)
static
obs_properties_t
GetDShowProperties
(
void
)
{
obs_properties_t
ppts
=
obs_properties_create
(
locale
);
obs_properties_t
ppts
=
obs_properties_create
();
PropertiesData
*
data
=
new
PropertiesData
;
obs_properties_set_param
(
ppts
,
data
,
PropertiesDataDestroy
);
...
...
plugins/win-wasapi/win-wasapi.cpp
浏览文件 @
2ea50cab
...
...
@@ -416,13 +416,13 @@ DWORD WINAPI WASAPISource::CaptureThread(LPVOID param)
/* ------------------------------------------------------------------------- */
static
const
char
*
GetWASAPIInputName
(
const
char
*
locale
)
static
const
char
*
GetWASAPIInputName
(
void
)
{
/* TODO: translate */
return
"Audio Input Capture (WASAPI)"
;
}
static
const
char
*
GetWASAPIOutputName
(
const
char
*
locale
)
static
const
char
*
GetWASAPIOutputName
(
void
)
{
/* TODO: translate */
return
"Audio Output Capture (WASAPI)"
;
...
...
@@ -466,9 +466,9 @@ static void UpdateWASAPISource(void *obj, obs_data_t settings)
static_cast
<
WASAPISource
*>
(
obj
)
->
Update
(
settings
);
}
static
obs_properties_t
GetWASAPIProperties
(
const
char
*
locale
,
bool
input
)
static
obs_properties_t
GetWASAPIProperties
(
bool
input
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
vector
<
AudioDeviceInfo
>
devices
;
/* TODO: translate */
...
...
@@ -494,14 +494,14 @@ static obs_properties_t GetWASAPIProperties(const char *locale, bool input)
return
props
;
}
static
obs_properties_t
GetWASAPIPropertiesInput
(
const
char
*
locale
)
static
obs_properties_t
GetWASAPIPropertiesInput
(
void
)
{
return
GetWASAPIProperties
(
locale
,
true
);
return
GetWASAPIProperties
(
true
);
}
static
obs_properties_t
GetWASAPIPropertiesOutput
(
const
char
*
locale
)
static
obs_properties_t
GetWASAPIPropertiesOutput
(
void
)
{
return
GetWASAPIProperties
(
locale
,
false
);
return
GetWASAPIProperties
(
false
);
}
void
RegisterWASAPIInput
()
...
...
test/osx/test.mm
浏览文件 @
2ea50cab
...
...
@@ -38,7 +38,7 @@ using SceneContext = OBSUniqueHandle<obs_scene,
static
void
CreateOBS
(
NSView
*
view
)
{
if
(
!
obs_startup
())
if
(
!
obs_startup
(
"en"
))
throw
"Couldn't create OBS"
;
struct
obs_video_info
ovi
;
...
...
test/test-input/test-desktop.m
浏览文件 @
2ea50cab
...
...
@@ -258,9 +258,8 @@ static void display_capture_video_render(void *data, effect_t effect)
technique_end
(
tech
);
}
static
const
char
*
display_capture_getname
(
const
char
*
locale
)
static
const
char
*
display_capture_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
return
"Display Capture"
;
}
...
...
@@ -300,9 +299,9 @@ static void display_capture_update(void *data, obs_data_t settings)
gs_leavecontext
();
}
static
obs_properties_t
display_capture_properties
(
char
const
*
locale
)
static
obs_properties_t
display_capture_properties
(
void
)
{
obs_properties_t
props
=
obs_properties_create
(
locale
);
obs_properties_t
props
=
obs_properties_create
();
obs_property_t
list
=
obs_properties_add_list
(
props
,
"display"
,
"Display"
,
...
...
test/test-input/test-filter.c
浏览文件 @
2ea50cab
...
...
@@ -5,9 +5,8 @@ struct test_filter {
effect_t
whatever
;
};
static
const
char
*
filter_getname
(
const
char
*
locale
)
static
const
char
*
filter_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
return
"Test"
;
}
...
...
test/test-input/test-random.c
浏览文件 @
2ea50cab
...
...
@@ -10,9 +10,8 @@ struct random_tex {
bool
initialized
;
};
static
const
char
*
random_getname
(
const
char
*
locale
)
static
const
char
*
random_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
return
"20x20 Random Pixel Texture Source (Test)"
;
}
...
...
test/test-input/test-sinewave.c
浏览文件 @
2ea50cab
...
...
@@ -58,9 +58,8 @@ static void *sinewave_thread(void *pdata)
/* ------------------------------------------------------------------------- */
static
const
char
*
sinewave_getname
(
const
char
*
locale
)
static
const
char
*
sinewave_getname
(
void
)
{
UNUSED_PARAMETER
(
locale
);
return
"Sinewave Sound Source (Test)"
;
}
...
...
test/win/test.cpp
浏览文件 @
2ea50cab
...
...
@@ -71,7 +71,7 @@ static void CreateOBS(HWND hwnd)
RECT
rc
;
GetClientRect
(
hwnd
,
&
rc
);
if
(
!
obs_startup
())
if
(
!
obs_startup
(
"en"
))
throw
"Couldn't create OBS"
;
struct
obs_video_info
ovi
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录