From cd2c75a05d60ddee735cfe9351bc399fc2f03b3e Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 28 Jul 2014 16:13:04 -0700 Subject: [PATCH] Rename get_encoder_info for consistency Sources/Outputs/Services all use a find_* naming scheme, so it felt out of place for the encoder to use a different naming scheme. --- libobs/obs-encoder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libobs/obs-encoder.c b/libobs/obs-encoder.c index e0b2c330c..b1664d2b5 100644 --- a/libobs/obs-encoder.c +++ b/libobs/obs-encoder.c @@ -18,7 +18,7 @@ #include "obs.h" #include "obs-internal.h" -static inline struct obs_encoder_info *get_encoder_info(const char *id) +static inline struct obs_encoder_info *find_encoder(const char *id) { for (size_t i = 0; i < obs->encoder_types.num; i++) { struct obs_encoder_info *info = obs->encoder_types.array+i; @@ -32,7 +32,7 @@ static inline struct obs_encoder_info *get_encoder_info(const char *id) const char *obs_encoder_getdisplayname(const char *id) { - struct obs_encoder_info *ei = get_encoder_info(id); + struct obs_encoder_info *ei = find_encoder(id); return ei ? ei->getname() : NULL; } @@ -60,7 +60,7 @@ static struct obs_encoder *create_encoder(const char *id, obs_data_t settings) { struct obs_encoder *encoder; - struct obs_encoder_info *ei = get_encoder_info(id); + struct obs_encoder_info *ei = find_encoder(id); bool success; if (!ei || ei->type != type) @@ -231,13 +231,13 @@ static inline obs_data_t get_defaults(const struct obs_encoder_info *info) obs_data_t obs_encoder_defaults(const char *id) { - const struct obs_encoder_info *info = get_encoder_info(id); + const struct obs_encoder_info *info = find_encoder(id); return (info) ? get_defaults(info) : NULL; } obs_properties_t obs_get_encoder_properties(const char *id) { - const struct obs_encoder_info *ei = get_encoder_info(id); + const struct obs_encoder_info *ei = find_encoder(id); if (ei && ei->properties) { obs_data_t defaults = get_defaults(ei); obs_properties_t properties; -- GitLab