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

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

View File

@@ -49,8 +49,8 @@ static bool init_encoder(struct obs_encoder *encoder, const char *name,
if (pthread_mutex_init(&encoder->outputs_mutex, NULL) != 0)
return false;
if (encoder->info.defaults)
encoder->info.defaults(encoder->context.settings);
if (encoder->info.get_defaults)
encoder->info.get_defaults(encoder->context.settings);
return true;
}
@@ -107,8 +107,8 @@ static inline struct audio_convert_info *get_audio_info(
aoi = audio_output_getinfo(encoder->media);
memset(info, 0, sizeof(struct audio_convert_info));
if (encoder->info.audio_info)
encoder->info.audio_info(encoder->context.data, info);
if (encoder->info.get_audio_info)
encoder->info.get_audio_info(encoder->context.data, info);
if (info->format == AUDIO_FORMAT_UNKNOWN)
info->format = aoi->format;
@@ -123,8 +123,8 @@ static inline struct audio_convert_info *get_audio_info(
static inline struct video_scale_info *get_video_info(
struct obs_encoder *encoder, struct video_scale_info *info)
{
if (encoder->info.video_info)
if (encoder->info.video_info(encoder->context.data, info))
if (encoder->info.get_video_info)
if (encoder->info.get_video_info(encoder->context.data, info))
return info;
return NULL;
@@ -224,8 +224,8 @@ const char *obs_encoder_get_name(obs_encoder_t encoder)
static inline obs_data_t get_defaults(const struct obs_encoder_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;
}
@@ -238,11 +238,11 @@ obs_data_t obs_encoder_defaults(const char *id)
obs_properties_t obs_get_encoder_properties(const char *id)
{
const struct obs_encoder_info *ei = find_encoder(id);
if (ei && ei->properties) {
if (ei && ei->get_properties) {
obs_data_t defaults = get_defaults(ei);
obs_properties_t properties;
properties = ei->properties();
properties = ei->get_properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@@ -252,9 +252,9 @@ obs_properties_t obs_get_encoder_properties(const char *id)
obs_properties_t obs_encoder_properties(obs_encoder_t encoder)
{
if (encoder && encoder->info.properties) {
if (encoder && encoder->info.get_properties) {
obs_properties_t props;
props = encoder->info.properties();
props = encoder->info.get_properties();
obs_properties_apply_settings(props, encoder->context.settings);
return props;
}
@@ -275,8 +275,8 @@ void obs_encoder_update(obs_encoder_t encoder, obs_data_t settings)
bool obs_encoder_get_extra_data(obs_encoder_t encoder, uint8_t **extra_data,
size_t *size)
{
if (encoder && encoder->info.extra_data && encoder->context.data)
return encoder->info.extra_data(encoder->context.data,
if (encoder && encoder->info.get_extra_data && encoder->context.data)
return encoder->info.get_extra_data(encoder->context.data,
extra_data, size);
return false;
@@ -307,7 +307,8 @@ static void intitialize_audio_encoder(struct obs_encoder *encoder)
encoder->samplerate = info.samples_per_sec;
encoder->planes = get_audio_planes(info.format, info.speakers);
encoder->blocksize = get_audio_size(info.format, info.speakers, 1);
encoder->framesize = encoder->info.frame_size(encoder->context.data);
encoder->framesize = encoder->info.get_frame_size(
encoder->context.data);
encoder->framesize_bytes = encoder->blocksize * encoder->framesize;
reset_audio_buffers(encoder);
@@ -453,8 +454,9 @@ bool obs_encoder_active(obs_encoder_t encoder)
static inline bool get_sei(struct obs_encoder *encoder,
uint8_t **sei, size_t *size)
{
if (encoder->info.sei_data)
return encoder->info.sei_data(encoder->context.data, sei, size);
if (encoder->info.get_sei_data)
return encoder->info.get_sei_data(encoder->context.data, sei,
size);
return false;
}

View File

@@ -139,7 +139,7 @@ struct obs_encoder_info {
struct encoder_packet *packet, bool *received_packet);
/** Audio encoder only: Returns the frame size for this encoder */
size_t (*frame_size)(void *data);
size_t (*get_frame_size)(void *data);
/* ----------------------------------------------------------------- */
/* Optional implementation */
@@ -149,14 +149,14 @@ struct obs_encoder_info {
*
* @param[out] settings Data to assign default settings to
*/
void (*defaults)(obs_data_t settings);
void (*get_defaults)(obs_data_t settings);
/**
* Gets the property information of this encoder
*
* @return The properties data
*/
obs_properties_t (*properties)(void);
obs_properties_t (*get_properties)(void);
/**
* Updates the settings for this encoder (usually used for things like
@@ -178,7 +178,7 @@ struct obs_encoder_info {
* @return true if extra data available, false
* otherwise
*/
bool (*extra_data)(void *data, uint8_t **extra_data, size_t *size);
bool (*get_extra_data)(void *data, uint8_t **extra_data, size_t *size);
/**
* Gets the SEI data, if any
@@ -188,7 +188,7 @@ struct obs_encoder_info {
* @param[out] size Pointer to receive the SEI data size
* @return true if SEI data available, false otherwise
*/
bool (*sei_data)(void *data, uint8_t **sei_data, size_t *size);
bool (*get_sei_data)(void *data, uint8_t **sei_data, size_t *size);
/**
* Returns desired audio format and sample information
@@ -198,7 +198,7 @@ struct obs_encoder_info {
* @return true if specific format is desired, false
* otherwise
*/
bool (*audio_info)(void *data, struct audio_convert_info *info);
bool (*get_audio_info)(void *data, struct audio_convert_info *info);
/**
* Returns desired video format information
@@ -208,7 +208,7 @@ struct obs_encoder_info {
* @return true if specific format is desired, false
* otherwise
*/
bool (*video_info)(void *data, struct video_scale_info *info);
bool (*get_video_info)(void *data, struct video_scale_info *info);
};
EXPORT void obs_register_encoder_s(const struct obs_encoder_info *info,

View File

@@ -509,7 +509,7 @@ void obs_register_encoder_s(const struct obs_encoder_info *info, size_t size)
CHECK_REQUIRED_VAL(info, encode, obs_register_encoder);
if (info->type == OBS_ENCODER_AUDIO)
CHECK_REQUIRED_VAL(info, frame_size, obs_register_encoder);
CHECK_REQUIRED_VAL(info, get_frame_size, obs_register_encoder);
REGISTER_OBS_DEF(size, obs_encoder_info, obs->encoder_types, info);
}

View File

@@ -78,8 +78,8 @@ obs_output_t obs_output_create(const char *id, const char *name,
output->info = *info;
output->video = obs_get_video();
output->audio = obs_get_audio();
if (output->info.defaults)
output->info.defaults(output->context.settings);
if (output->info.get_defaults)
output->info.get_defaults(output->context.settings);
ret = os_event_init(&output->reconnect_stop_event,
OS_EVENT_TYPE_MANUAL);
@@ -178,8 +178,8 @@ bool obs_output_active(obs_output_t output)
static inline obs_data_t get_defaults(const struct obs_output_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;
}
@@ -192,11 +192,11 @@ obs_data_t obs_output_defaults(const char *id)
obs_properties_t obs_get_output_properties(const char *id)
{
const struct obs_output_info *info = find_output(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;
@@ -206,9 +206,9 @@ obs_properties_t obs_get_output_properties(const char *id)
obs_properties_t obs_output_properties(obs_output_t output)
{
if (output && output->info.properties) {
if (output && output->info.get_properties) {
obs_properties_t props;
props = output->info.properties();
props = output->info.get_properties();
obs_properties_apply_settings(props, output->context.settings);
return props;
}
@@ -346,18 +346,18 @@ void obs_output_set_reconnect_settings(obs_output_t output,
uint64_t obs_output_get_total_bytes(obs_output_t output)
{
if (!output || !output->info.total_bytes)
if (!output || !output->info.get_total_bytes)
return 0;
return output->info.total_bytes(output->context.data);
return output->info.get_total_bytes(output->context.data);
}
int obs_output_get_frames_dropped(obs_output_t output)
{
if (!output || !output->info.dropped_frames)
if (!output || !output->info.get_dropped_frames)
return 0;
return output->info.dropped_frames(output->context.data);
return output->info.get_dropped_frames(output->context.data);
}
int obs_output_get_total_frames(obs_output_t output)

View File

@@ -47,15 +47,15 @@ struct obs_output_info {
/* optional */
void (*update)(void *data, obs_data_t settings);
void (*defaults)(obs_data_t settings);
void (*get_defaults)(obs_data_t settings);
obs_properties_t (*properties)(void);
obs_properties_t (*get_properties)(void);
void (*pause)(void *data);
uint64_t (*total_bytes)(void *data);
uint64_t (*get_total_bytes)(void *data);
int (*dropped_frames)(void *data);
int (*get_dropped_frames)(void *data);
};
EXPORT void obs_register_output_s(const struct obs_output_info *info,

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

View File

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

View File

@@ -171,8 +171,8 @@ obs_source_t obs_source_create(enum obs_source_type type, const char *id,
if (!obs_source_init_context(source, settings, name))
goto fail;
if (info && info->defaults)
info->defaults(source->context.settings);
if (info && info->get_defaults)
info->get_defaults(source->context.settings);
/* allow the source to be created even if creation fails so that the
* user's data doesn't become lost */
@@ -321,8 +321,8 @@ bool obs_source_removed(obs_source_t source)
static inline obs_data_t get_defaults(const struct obs_source_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;
}
@@ -336,11 +336,11 @@ obs_properties_t obs_get_source_properties(enum obs_source_type type,
const char *id)
{
const struct obs_source_info *info = get_source_info(type, 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;
@@ -350,9 +350,9 @@ obs_properties_t obs_get_source_properties(enum obs_source_type type,
obs_properties_t obs_source_properties(obs_source_t source)
{
if (source_valid(source) && source->info.properties) {
if (source_valid(source) && source->info.get_properties) {
obs_properties_t props;
props = source->info.properties();
props = source->info.get_properties();
obs_properties_apply_settings(props, source->context.settings);
return props;
}

View File

@@ -155,14 +155,14 @@ struct obs_source_info {
*
* @param[out] settings Data to assign default settings to
*/
void (*defaults)(obs_data_t settings);
void (*get_defaults)(obs_data_t settings);
/**
* Gets the property information of this source
*
* @return The properties data
*/
obs_properties_t (*properties)(void);
obs_properties_t (*get_properties)(void);
/**
* Updates the settings for this source