OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(API Change) libobs/callback: Unsquish names

Browse source 
Renamed:                  To:
-------------------------------------------------
calldata_getdata          calldata_get_data
calldata_getint           calldata_get_int
calldata_getfloat         calldata_get_float
calldata_getbool          calldata_get_bool
calldata_getptr           calldata_get_ptr
calldata_getstring        calldata_get_string
calldata_setdata          calldata_set_data
calldata_setint           calldata_set_int
calldata_setfloat         calldata_set_float
calldata_setbool          calldata_set_bool
calldata_setptr           calldata_set_ptr
calldata_setstring        calldata_set_string
This commit is contained in:
jp9000 2014-08-05 17:49:28 -07:00
parent 42a0925ce1
commit 50ec8b0d55
6 changed files with 60 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libobs/callback/calldata.c
View file

@ -159,7 +159,8 @@ static inline void cd_ensure_capacity(calldata_t data, uint8_t **pos,
/* ------------------------------------------------------------------------- */
bool calldata_getdata(calldata_t data, const char *name, void *out, size_t size)
bool calldata_get_data(calldata_t data, const char *name, void *out,
size_t size)
{
uint8_t *pos;
size_t data_size;
@ -178,7 +179,7 @@ bool calldata_getdata(calldata_t data, const char *name, void *out, size_t size)
return true;
}
void calldata_setdata(calldata_t data, const char *name, const void *in,
void calldata_set_data(calldata_t data, const char *name, const void *in,
size_t size)
{
uint8_t *pos = NULL;
@ -224,7 +225,7 @@ void calldata_setdata(calldata_t data, const char *name, const void *in,
}
}
bool calldata_getstring(calldata_t data, const char *name, const char **str)
bool calldata_get_string(calldata_t data, const char *name, const char **str)
{
uint8_t *pos;
if (!data || !name || !*name)

54
libobs/callback/calldata.h
View file

@ -61,9 +61,9 @@ static inline void calldata_free(struct calldata *data)
bfree(data->stack);
}
EXPORT bool calldata_getdata(calldata_t data, const char *name, void *out,
EXPORT bool calldata_get_data(calldata_t data, const char *name, void *out,
size_t size);
EXPORT void calldata_setdata(calldata_t data, const char *name, const void *in,
EXPORT void calldata_set_data(calldata_t data, const char *name, const void *in,
size_t new_size);
static inline void calldata_clear(struct calldata *data)
@ -78,31 +78,31 @@ static inline void calldata_clear(struct calldata *data)
/* NOTE: 'get' functions return true only if paramter exists, and is the
* same type. They return false otherwise. */
static inline bool calldata_getint(calldata_t data, const char *name,
static inline bool calldata_get_int(calldata_t data, const char *name,
long long *val)
{
return calldata_getdata(data, name, val, sizeof(*val));
return calldata_get_data(data, name, val, sizeof(*val));
}
static inline bool calldata_getfloat (calldata_t data, const char *name,
static inline bool calldata_get_float (calldata_t data, const char *name,
double *val)
{
return calldata_getdata(data, name, val, sizeof(*val));
return calldata_get_data(data, name, val, sizeof(*val));
}
static inline bool calldata_getbool (calldata_t data, const char *name,
static inline bool calldata_get_bool (calldata_t data, const char *name,
bool *val)
{
return calldata_getdata(data, name, val, sizeof(*val));
return calldata_get_data(data, name, val, sizeof(*val));
}
static inline bool calldata_getptr (calldata_t data, const char *name,
static inline bool calldata_get_ptr (calldata_t data, const char *name,
void *p_ptr)
{
return calldata_getdata(data, name, p_ptr, sizeof(p_ptr));
return calldata_get_data(data, name, p_ptr, sizeof(p_ptr));
}
EXPORT bool calldata_getstring(calldata_t data, const char *name,
EXPORT bool calldata_get_string(calldata_t data, const char *name,
const char **str);
/* ------------------------------------------------------------------------- */
@ -111,71 +111,71 @@ EXPORT bool calldata_getstring(calldata_t data, const char *name,
static inline long long calldata_int(calldata_t data, const char *name)
{
long long val = 0;
calldata_getint(data, name, &val);
calldata_get_int(data, name, &val);
return val;
}
static inline double calldata_float(calldata_t data, const char *name)
{
double val = 0.0;
calldata_getfloat(data, name, &val);
calldata_get_float(data, name, &val);
return val;
}
static inline bool calldata_bool(calldata_t data, const char *name)
{
bool val = false;
calldata_getbool(data, name, &val);
calldata_get_bool(data, name, &val);
return val;
}
static inline void *calldata_ptr(calldata_t data, const char *name)
{
void *val;
calldata_getptr(data, name, &val);
calldata_get_ptr(data, name, &val);
return val;
}
static inline const char *calldata_string(calldata_t data, const char *name)
{
const char *val;
calldata_getstring(data, name, &val);
calldata_get_string(data, name, &val);
return val;
}
/* ------------------------------------------------------------------------- */
static inline void calldata_setint (calldata_t data, const char *name,
static inline void calldata_set_int (calldata_t data, const char *name,
long long val)
{
calldata_setdata(data, name, &val, sizeof(val));
calldata_set_data(data, name, &val, sizeof(val));
}
static inline void calldata_setfloat (calldata_t data, const char *name,
static inline void calldata_set_float (calldata_t data, const char *name,
double val)
{
calldata_setdata(data, name, &val, sizeof(val));
calldata_set_data(data, name, &val, sizeof(val));
}
static inline void calldata_setbool (calldata_t data, const char *name,
static inline void calldata_set_bool (calldata_t data, const char *name,
bool val)
{
calldata_setdata(data, name, &val, sizeof(val));
calldata_set_data(data, name, &val, sizeof(val));
}
static inline void calldata_setptr (calldata_t data, const char *name,
static inline void calldata_set_ptr (calldata_t data, const char *name,
void *ptr)
{
calldata_setdata(data, name, &ptr, sizeof(ptr));
calldata_set_data(data, name, &ptr, sizeof(ptr));
}
static inline void calldata_setstring(calldata_t data, const char *name,
static inline void calldata_set_string(calldata_t data, const char *name,
const char *str)
{
if (str)
calldata_setdata(data, name, str, strlen(str)+1);
calldata_set_data(data, name, str, strlen(str)+1);
else
calldata_setdata(data, name, NULL, 0);
calldata_set_data(data, name, NULL, 0);
}
#ifdef __cplusplus

6
libobs/obs-output.c
View file

@ -591,7 +591,7 @@ static inline void do_output_signal(struct obs_output *output,
const char *signal)
{
struct calldata params = {0};
calldata_setptr(&params, "output", output);
calldata_set_ptr(&params, "output", output);
signal_handler_signal(output->context.signals, signal, &params);
calldata_free(&params);
}
@ -614,8 +614,8 @@ static inline void signal_reconnect_success(struct obs_output *output)
static inline void signal_stop(struct obs_output *output, int code)
{
struct calldata params = {0};
calldata_setint(&params, "code", code);
calldata_setptr(&params, "output", output);
calldata_set_int(&params, "code", code);
calldata_set_ptr(&params, "output", output);
signal_handler_signal(output->context.signals, "stop", &params);
calldata_free(&params);
}

20
libobs/obs-scene.c
View file

@ -35,8 +35,8 @@ static const char *obs_scene_signals[] = {
static inline void signal_item_remove(struct obs_scene_item *item)
{
struct calldata params = {0};
calldata_setptr(&params, "scene", item->parent);
calldata_setptr(&params, "item", item);
calldata_set_ptr(&params, "scene", item->parent);
calldata_set_ptr(&params, "item", item);
signal_handler_signal(item->parent->source->context.signals,
"item_remove", &params);
@ -282,8 +282,8 @@ static void update_item_transform(struct obs_scene_item *item)
item->last_width = width;
item->last_height = height;
calldata_setptr(&params, "scene", item->parent);
calldata_setptr(&params, "item", item);
calldata_set_ptr(&params, "scene", item->parent);
calldata_set_ptr(&params, "item", item);
signal_handler_signal(item->parent->source->context.signals,
"item_transform", &params);
calldata_free(&params);
@ -579,8 +579,8 @@ obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source)
pthread_mutex_unlock(&scene->mutex);
calldata_setptr(&params, "scene", scene);
calldata_setptr(&params, "item", item);
calldata_set_ptr(&params, "scene", scene);
calldata_set_ptr(&params, "item", item);
signal_handler_signal(scene->source->context.signals, "item_add",
&params);
calldata_free(&params);
@ -664,8 +664,8 @@ void obs_sceneitem_select(obs_sceneitem_t item, bool select)
item->selected = select;
calldata_setptr(&params, "scene", item->parent);
calldata_setptr(&params, "item", item);
calldata_set_ptr(&params, "scene", item->parent);
calldata_set_ptr(&params, "item", item);
signal_handler_signal(item->parent->source->context.signals,
command, &params);
@ -722,8 +722,8 @@ static inline void signal_move_dir(struct obs_scene_item *item,
case OBS_ORDER_MOVE_BOTTOM: command = "item_move_bottom"; break;
}
calldata_setptr(&params, "scene", item->parent);
calldata_setptr(&params, "item", item);
calldata_set_ptr(&params, "scene", item->parent);
calldata_set_ptr(&params, "item", item);
signal_handler_signal(item->parent->source->context.signals,
command, &params);

20
libobs/obs-source.c
View file

@ -143,7 +143,7 @@ static inline void obs_source_dosignal(struct obs_source *source,
struct calldata data;
calldata_init(&data);
calldata_setptr(&data, "source", source);
calldata_set_ptr(&data, "source", source);
if (signal_obs)
signal_handler_signal(obs->signals, signal_obs, &data);
if (signal_source)
@ -611,10 +611,10 @@ static void obs_source_update_volume_level(obs_source_t source,
calc_volume_levels(source, (float*)in->data[0], in->frames,
in->volume);
calldata_setptr (&data, "source", source);
calldata_setfloat(&data, "level", source->vol_max);
calldata_setfloat(&data, "magnitude", source->vol_mag);
calldata_setfloat(&data, "peak", source->vol_peak);
calldata_set_ptr (&data, "source", source);
calldata_set_float(&data, "level", source->vol_max);
calldata_set_float(&data, "magnitude", source->vol_mag);
calldata_set_float(&data, "peak", source->vol_peak);
signal_handler_signal(source->context.signals, "volume_level",
&data);
@ -1632,9 +1632,9 @@ void obs_source_set_name(obs_source_t source, const char *name)
obs_context_data_setname(&source->context, name);
calldata_init(&data);
calldata_setptr(&data, "source", source);
calldata_setstring(&data, "new_name", source->context.name);
calldata_setstring(&data, "prev_name", prev_name);
calldata_set_ptr(&data, "source", source);
calldata_set_string(&data, "new_name", source->context.name);
calldata_set_string(&data, "prev_name", prev_name);
signal_handler_signal(obs->signals, "source_rename", &data);
signal_handler_signal(source->context.signals, "rename", &data);
calldata_free(&data);
@ -1750,8 +1750,8 @@ void obs_source_set_volume(obs_source_t source, float volume)
{
if (source) {
struct calldata data = {0};
calldata_setptr(&data, "source", source);
calldata_setfloat(&data, "volume", volume);
calldata_set_ptr(&data, "source", source);
calldata_set_float(&data, "volume", volume);
signal_handler_signal(source->context.signals, "volume", &data);
signal_handler_signal(obs->signals, "source_volume", &data);

12
libobs/obs.c
View file

@ -903,7 +903,7 @@ bool obs_add_source(obs_source_t source)
obs_source_addref(source);
pthread_mutex_unlock(&obs->data.sources_mutex);
calldata_setptr(&params, "source", source);
calldata_set_ptr(&params, "source", source);
signal_handler_signal(obs->signals, "source_add", &params);
calldata_free(&params);
@ -933,11 +933,11 @@ void obs_set_output_source(uint32_t channel, obs_source_t source)
prev_source = view->channels[channel];
calldata_setint(&params, "channel", channel);
calldata_setptr(&params, "prev_source", prev_source);
calldata_setptr(&params, "source", source);
calldata_set_int(&params, "channel", channel);
calldata_set_ptr(&params, "prev_source", prev_source);
calldata_set_ptr(&params, "source", source);
signal_handler_signal(obs->signals, "channel_change", &params);
calldata_getptr(&params, "source", &source);
calldata_get_ptr(&params, "source", &source);
calldata_free(&params);
view->channels[channel] = source;
@ -1135,7 +1135,7 @@ void obs_set_master_volume(float volume)
if (!obs) return;
calldata_setfloat(&data, "volume", volume);
calldata_set_float(&data, "volume", volume);
signal_handler_signal(obs->signals, "master_volume", &data);
volume = (float)calldata_float(&data, "volume");
calldata_free(&data);