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

master
Palana 2014-09-29 17:36:13 +02:00
parent 74c4932184
commit 94a93abb2b
29 changed files with 76 additions and 36 deletions
Show Stats 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

4
plugins/image-source/image-source.c
View File

@ -96,8 +96,10 @@ static const char *image_filter =
"JPEG Files (*.jpeg *.jpg);;"
"GIF Files (*.gif)";
static obs_properties_t *image_source_properties(void)
static obs_properties_t *image_source_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_properties_add_path(props,

4
plugins/linux-capture/xcomposite-main.cpp
View File

@ -37,8 +37,10 @@ static uint32_t xcompcap_getheight(void* data)
return cc->height();
}
static obs_properties_t *xcompcap_props(void)
static obs_properties_t *xcompcap_props(void *unused)
{
UNUSED_PARAMETER(unused);
return XCompcapMain::properties();
}

4
plugins/linux-capture/xshm-input.c
View File

@ -153,8 +153,10 @@ static void xshm_defaults(obs_data_t *defaults)
/**
* Get the properties for the capture
*/
static obs_properties_t *xshm_properties(void)
static obs_properties_t *xshm_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
int_fast32_t screen_max;

8
plugins/linux-pulseaudio/pulse-input.c
View File

@ -344,13 +344,17 @@ static obs_properties_t *pulse_properties(bool input)
return props;
}
static obs_properties_t *pulse_input_properties(void)
static obs_properties_t *pulse_input_properties(void *unused)
{
UNUSED_PARAMETER(unused);
return pulse_properties(true);
}
static obs_properties_t *pulse_output_properties(void)
static obs_properties_t *pulse_output_properties(void *unused)
{
UNUSED_PARAMETER(unused);
return pulse_properties(false);
}

4
plugins/linux-v4l2/v4l2-input.c
View File

@ -504,8 +504,10 @@ static bool resolution_selected(obs_properties_t *props, obs_property_t *p,
return true;
}
static obs_properties_t *v4l2_properties(void)
static obs_properties_t *v4l2_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_property_t *device_list = obs_properties_add_list(props,

4
plugins/mac-avcapture/av-capture.m
View File

@ -756,8 +756,10 @@ static bool properties_preset_changed(obs_properties_t *props, obs_property_t *p
return preset_list_changed || autoselect_changed;
}
static obs_properties_t *av_capture_properties(void)
static obs_properties_t *av_capture_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_property_t *dev_list = obs_properties_add_list(props, "device",

8
plugins/mac-capture/mac-audio.c
View File

@ -732,13 +732,17 @@ static obs_properties_t *coreaudio_properties(bool input)
return props;
}
static obs_properties_t *coreaudio_input_properties(void)
static obs_properties_t *coreaudio_input_properties(void *unused)
{
UNUSED_PARAMETER(unused);
return coreaudio_properties(true);
}
static obs_properties_t *coreaudio_output_properties(void)
static obs_properties_t *coreaudio_output_properties(void *unused)
{
UNUSED_PARAMETER(unused);
return coreaudio_properties(false);
}

4
plugins/mac-capture/mac-display-capture.m
View File

@ -590,8 +590,10 @@ static const char *crop_names[] = {
#ifndef COUNTOF
#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
#endif
static obs_properties_t *display_capture_properties(void)
static obs_properties_t *display_capture_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_property_t *list = obs_properties_add_list(props,

4
plugins/mac-capture/mac-window-capture.m
View File

@ -156,8 +156,10 @@ static void window_capture_defaults(obs_data_t *settings)
window_defaults(settings);
}
static obs_properties_t *window_capture_properties(void)
static obs_properties_t *window_capture_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
add_window_properties(props);

4
plugins/obs-ffmpeg/obs-ffmpeg-aac.c
View File

@ -240,8 +240,10 @@ static void aac_defaults(obs_data_t *settings)
obs_data_set_default_int(settings, "bitrate", 128);
}
static obs_properties_t *aac_properties(void)
static obs_properties_t *aac_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_properties_add_int(props, "bitrate",

4
plugins/obs-libfdk/obs-libfdk.c
View File

@ -64,8 +64,10 @@ static const char *libfdk_getname(void)
return obs_module_text("LibFDK");
}
static obs_properties_t *libfdk_properties(void)
static obs_properties_t *libfdk_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_properties_add_int(props, "bitrate",

4
plugins/obs-outputs/flv-output.c
View File

@ -197,8 +197,10 @@ static void flv_output_data(void *data, struct encoder_packet *packet)
}
}
static obs_properties_t *flv_output_properties(void)
static obs_properties_t *flv_output_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_properties_add_text(props, "path",

4
plugins/obs-outputs/rtmp-stream.c
View File

@ -565,8 +565,10 @@ static void rtmp_stream_defaults(obs_data_t *defaults)
obs_data_set_default_int(defaults, OPT_DROP_THRESHOLD, 600);
}
static obs_properties_t *rtmp_stream_properties(void)
static obs_properties_t *rtmp_stream_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_properties_add_int(props, OPT_DROP_THRESHOLD,

4
plugins/obs-x264/obs-x264.c
View File

@ -118,8 +118,10 @@ static inline void add_strings(obs_property_t *list, const char *const *strings)
#define TEXT_TUNE obs_module_text("Tune")
#define TEXT_X264_OPTS obs_module_text("EncoderOptions")
static obs_properties_t *obs_x264_props(void)
static obs_properties_t *obs_x264_props(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
obs_property_t *list;

4
plugins/rtmp-services/rtmp-common.c
View File

@ -197,8 +197,10 @@ static bool service_selected(obs_properties_t *props, obs_property_t *p,
return true;
}
static obs_properties_t *rtmp_common_properties(void)
static obs_properties_t *rtmp_common_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *ppts = obs_properties_create();
obs_property_t *list;
char *file;

4
plugins/rtmp-services/rtmp-custom.c
View File

@ -38,8 +38,10 @@ static void *rtmp_custom_create(obs_data_t *settings, obs_service_t *service)
return data;
}
static obs_properties_t *rtmp_custom_properties(void)
static obs_properties_t *rtmp_custom_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *ppts = obs_properties_create();
obs_properties_add_text(ppts, "server", "URL", OBS_TEXT_DEFAULT);

4
plugins/text-freetype2/text-freetype2.c
View File

@ -87,8 +87,10 @@ static uint32_t ft2_source_get_height(void *data)
return srcdata->cy;
}
static obs_properties_t *ft2_source_properties(void)
static obs_properties_t *ft2_source_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *props = obs_properties_create();
//obs_property_t *prop;

2
plugins/text-freetype2/text-freetype2.h
View File

@ -77,7 +77,7 @@ void draw_drop_shadow(struct ft2_source *srcdata);
static uint32_t ft2_source_get_width(void *data);
static uint32_t ft2_source_get_height(void *data);
static obs_properties_t *ft2_source_properties(void);
static obs_properties_t *ft2_source_properties(void *unused);
static const char *ft2_source_get_name(void);

4
plugins/win-capture/window-capture.c
View File

@ -369,8 +369,10 @@ static void wc_defaults(obs_data_t *defaults)
obs_data_set_default_bool(defaults, "compatibility", false);
}
static obs_properties_t *wc_properties(void)
static obs_properties_t *wc_properties(void *unused)
{
UNUSED_PARAMETER(unused);
obs_properties_t *ppts = obs_properties_create();
obs_property_t *p;

2
plugins/win-dshow/win-dshow.cpp
View File

@ -1508,7 +1508,7 @@ static bool CustomAudioClicked(obs_properties_t *props, obs_property_t *p,
return true;
}
static obs_properties_t *GetDShowProperties(void)
static obs_properties_t *GetDShowProperties(void *)
{
obs_properties_t *ppts = obs_properties_create();
PropertiesData *data = new PropertiesData;

4
plugins/win-wasapi/win-wasapi.cpp
View File

@ -496,12 +496,12 @@ static obs_properties_t *GetWASAPIProperties(bool input)
return props;
}
static obs_properties_t *GetWASAPIPropertiesInput(void)
static obs_properties_t *GetWASAPIPropertiesInput(void *)
{
return GetWASAPIProperties(true);
}
static obs_properties_t *GetWASAPIPropertiesOutput(void)
static obs_properties_t *GetWASAPIPropertiesOutput(void *)
{
return GetWASAPIProperties(false);
}