jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove external ref count visibilty from obs_data_* as well

Browse Source
This commit is contained in:
Palana 2014-02-03 05:34:17 +01:00
parent 935fa62db6
commit a2cd42abf0
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libobs/obs-data.c
View File

@ -237,9 +237,10 @@ obs_data_t obs_data_create_from_json(const char *json_string)
return NULL;
}
int obs_data_addref(obs_data_t data)
void obs_data_addref(obs_data_t data)
{
return data ? ++data->ref : 0;
if (data)
++data->ref;
}
static inline void obs_data_destroy(struct obs_data *data)
@ -256,16 +257,13 @@ static inline void obs_data_destroy(struct obs_data *data)
bfree(data);
}
int obs_data_release(obs_data_t data)
void obs_data_release(obs_data_t data)
{
if (!data)
return 0;
return;
int ref = --data->ref;
if (!ref)
if (--data->ref == 0)
obs_data_destroy(data);
return ref;
}
const char *obs_data_getjson(obs_data_t data)
@ -461,9 +459,10 @@ obs_data_array_t obs_data_array_create()
return array;
}
int obs_data_array_addref(obs_data_array_t array)
void obs_data_array_addref(obs_data_array_t array)
{
return array ? ++array->ref : 0;
if (array)
++array->ref;
}
static inline void obs_data_array_destroy(obs_data_array_t array)
@ -474,13 +473,13 @@ static inline void obs_data_array_destroy(obs_data_array_t array)
bfree(array);
}
int obs_data_array_release(obs_data_array_t array)
void obs_data_array_release(obs_data_array_t array)
{
int ref = --array->ref;
if (!ref)
obs_data_array_destroy(array);
if (!array)
return;
return ref;
if (--array->ref == 0)
obs_data_array_destroy(array);
}
size_t obs_data_array_count(obs_data_array_t array)

8
libobs/obs-data.h
View File

@ -51,8 +51,8 @@ enum obs_data_type {
EXPORT obs_data_t obs_data_create();
EXPORT obs_data_t obs_data_create_from_json(const char *json_string);
EXPORT int obs_data_addref(obs_data_t data);
EXPORT int obs_data_release(obs_data_t data);
EXPORT void obs_data_addref(obs_data_t data);
EXPORT void obs_data_release(obs_data_t data);
EXPORT const char *obs_data_getjson(obs_data_t data);
@ -99,8 +99,8 @@ EXPORT obs_data_array_t obs_data_getarray(obs_data_t data, const char *name);
/* Array functions */
EXPORT obs_data_array_t obs_data_array_create();
EXPORT int obs_data_array_addref(obs_data_array_t array);
EXPORT int obs_data_array_release(obs_data_array_t array);
EXPORT void obs_data_array_addref(obs_data_array_t array);
EXPORT void obs_data_array_release(obs_data_array_t array);
EXPORT size_t obs_data_array_count(obs_data_array_t array);
EXPORT obs_data_t obs_data_array_item(obs_data_array_t array, size_t idx);