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

(API Change) Pass data to get_properties when possible

Browse Source
This commit is contained in:
Palana
2014-09-29 17:36:13 +02:00
parent 74c4932184
commit 94a93abb2b
29 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/obs-service.c
View File

@@ -122,7 +122,7 @@ obs_properties_t *obs_get_service_properties(const char *id)
obs_data_t *defaults = get_defaults(info);
obs_properties_t *properties;
properties = info->get_properties();
properties = info->get_properties(NULL);
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@@ -134,7 +134,7 @@ obs_properties_t *obs_service_properties(const obs_service_t *service)
{
if (service && service->info.get_properties) {
obs_properties_t *props;
props = service->info.get_properties();
props = service->info.get_properties(service->context.data);
obs_properties_apply_settings(props, service->context.settings);
return props;
}