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

(API Change) Use 'get' convention: API callbacks

Browse Source 
Renamed:                       To:
-------------------------------------------------------
obs_source_info::defaults       obs_source_info::get_defaults
obs_source_info::properties     obs_source_info::get_properties
obs_output_info::defaults       obs_output_info::get_defaults
obs_output_info::properties     obs_output_info::get_properties
obs_output_info::total_bytes    obs_output_info::get_total_bytes
obs_output_info::dropped_frames obs_output_info::get_dropped_frames
obs_encoder_info::defaults      obs_encoder_info::get_defaults
obs_encoder_info::properties    obs_encoder_info::get_properties
obs_encoder_info::extra_data    obs_encoder_info::get_extra_data
obs_encoder_info::sei_data      obs_encoder_info::get_sei_data
obs_encoder_info::audio_info    obs_encoder_info::get_audio_info
obs_encoder_info::video_info    obs_encoder_info::get_video_fino
obs_service_info::defaults      obs_service_info::get_defaults
obs_service_info::properties    obs_service_info::get_properties
This commit is contained in:
jp9000
2014-08-04 21:27:52 -07:00
parent c83d05117f
commit 2d606dd8d8
28 changed files with 254 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libobs/obs-service.c
View File

@@ -104,8 +104,8 @@ const char *obs_service_get_name(obs_service_t service)
static inline obs_data_t get_defaults(const struct obs_service_info *info)
{
obs_data_t settings = obs_data_create();
if (info->defaults)
info->defaults(settings);
if (info->get_defaults)
info->get_defaults(settings);
return settings;
}
@@ -118,11 +118,11 @@ obs_data_t obs_service_defaults(const char *id)
obs_properties_t obs_get_service_properties(const char *id)
{
const struct obs_service_info *info = find_service(id);
if (info && info->properties) {
if (info && info->get_properties) {
obs_data_t defaults = get_defaults(info);
obs_properties_t properties;
properties = info->properties();
properties = info->get_properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@@ -132,9 +132,9 @@ obs_properties_t obs_get_service_properties(const char *id)
obs_properties_t obs_service_properties(obs_service_t service)
{
if (service && service->info.properties) {
if (service && service->info.get_properties) {
obs_properties_t props;
props = service->info.properties();
props = service->info.get_properties();
obs_properties_apply_settings(props, service->context.settings);
return props;
}