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-encoder.c
View File

@@ -266,7 +266,7 @@ obs_properties_t *obs_get_encoder_properties(const char *id)
obs_data_t *defaults = get_defaults(ei);
obs_properties_t *properties;
properties = ei->get_properties();
properties = ei->get_properties(NULL);
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@@ -278,7 +278,7 @@ obs_properties_t *obs_encoder_properties(const obs_encoder_t *encoder)
{
if (encoder && encoder->info.get_properties) {
obs_properties_t *props;
props = encoder->info.get_properties();
props = encoder->info.get_properties(encoder->context.data);
obs_properties_apply_settings(props, encoder->context.settings);
return props;
}

2
libobs/obs-encoder.h
View File

@@ -156,7 +156,7 @@ struct obs_encoder_info {
*
* @return The properties data
*/
obs_properties_t *(*get_properties)(void);
obs_properties_t *(*get_properties)(void *data);
/**
* Updates the settings for this encoder (usually used for things like

4
libobs/obs-output.c
View File

@@ -234,7 +234,7 @@ obs_properties_t *obs_get_output_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;
@@ -246,7 +246,7 @@ obs_properties_t *obs_output_properties(const obs_output_t *output)
{
if (output && output->info.get_properties) {
obs_properties_t *props;
props = output->info.get_properties();
props = output->info.get_properties(output->context.data);
obs_properties_apply_settings(props, output->context.settings);
return props;
}

2
libobs/obs-output.h
View File

@@ -49,7 +49,7 @@ struct obs_output_info {
void (*get_defaults)(obs_data_t *settings);
obs_properties_t *(*get_properties)(void);
obs_properties_t *(*get_properties)(void *data);
void (*pause)(void *data);

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;
}

2
libobs/obs-service.h
View File

@@ -33,7 +33,7 @@ struct obs_service_info {
void (*get_defaults)(obs_data_t *settings);
obs_properties_t *(*get_properties)(void);
obs_properties_t *(*get_properties)(void *data);
/**
* Called when getting ready to start up an output, before the encoders

4
libobs/obs-source.c
View File

@@ -340,7 +340,7 @@ obs_properties_t *obs_get_source_properties(enum obs_source_type type,
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;
@@ -352,7 +352,7 @@ obs_properties_t *obs_source_properties(const obs_source_t *source)
{
if (source_valid(source) && source->info.get_properties) {
obs_properties_t *props;
props = source->info.get_properties();
props = source->info.get_properties(source->context.data);
obs_properties_apply_settings(props, source->context.settings);
return props;
}

2
libobs/obs-source.h
View File

@@ -170,7 +170,7 @@ struct obs_source_info {
*
* @return The properties data
*/
obs_properties_t *(*get_properties)(void);
obs_properties_t *(*get_properties)(void *data);
/**
* Updates the settings for this source