jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Fix property text typo

Browse Source 
(This commit also modifies UI)

Closes jp9000/obs-studio#1204
This commit is contained in:
jamacanbacn
2018-02-21 19:22:53 -08:00
committed by jp9000
parent acf7d12b7d
commit 8a59d68e47
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libobs/obs-properties.c
View File

@@ -738,7 +738,7 @@ enum obs_number_type obs_property_float_type(obs_property_t *p)
return data ? data->type : OBS_NUMBER_SCROLLER;
}
enum obs_text_type obs_proprety_text_type(obs_property_t *p)
enum obs_text_type obs_property_text_type(obs_property_t *p)
{
struct text_data *data = get_type_data(p, OBS_PROPERTY_TEXT);
return data ? data->type : OBS_TEXT_DEFAULT;
@@ -1107,3 +1107,8 @@ struct media_frames_per_second obs_property_frame_rate_fps_range_max(
data->ranges.array[idx].max_time :
(struct media_frames_per_second){0};
}
enum obs_text_type obs_proprety_text_type(obs_property_t *p)
{
return obs_property_text_type(p);
}

7
libobs/obs-properties.h
View File

@@ -263,7 +263,7 @@ EXPORT double obs_property_float_min(obs_property_t *p);
EXPORT double obs_property_float_max(obs_property_t *p);
EXPORT double obs_property_float_step(obs_property_t *p);
EXPORT enum obs_number_type obs_property_float_type(obs_property_t *p);
EXPORT enum obs_text_type obs_proprety_text_type(obs_property_t *p);
EXPORT enum obs_text_type obs_property_text_type(obs_property_t *p);
EXPORT enum obs_path_type obs_property_path_type(obs_property_t *p);
EXPORT const char * obs_property_path_filter(obs_property_t *p);
EXPORT const char * obs_property_path_default_path(obs_property_t *p);
@@ -336,6 +336,11 @@ EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_min(
EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_max(
obs_property_t *p, size_t idx);
#ifndef SWIG
DEPRECATED
EXPORT enum obs_text_type obs_proprety_text_type(obs_property_t *p);
#endif
#ifdef __cplusplus
}
#endif