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

Remove external ref count visibility

Browse source 
The returned ref count was never used and the returned value doesn't
actually confer any meaning in a multithreaded environment
This commit is contained in:
Palana 2014-02-03 02:34:06 +01:00
parent be139710a2
commit ac23df500a
3 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libobs/obs-scene.c
View file

@ -197,14 +197,16 @@ obs_scene_t obs_scene_create(const char *name)
return scene;
}
int obs_scene_addref(obs_scene_t scene)
void obs_scene_addref(obs_scene_t scene)
{
return scene ? obs_source_addref(scene->source) : 0;
if (scene)
obs_source_addref(scene->source);
}
int obs_scene_release(obs_scene_t scene)
void obs_scene_release(obs_scene_t scene)
{
return scene ? obs_source_release(scene->source) : 0;
if (scene)
obs_source_release(scene->source);
}
obs_source_t obs_scene_getsource(obs_scene_t scene)
@ -312,22 +314,19 @@ static void obs_sceneitem_destroy(obs_sceneitem_t item)
}
}
int obs_sceneitem_addref(obs_sceneitem_t item)
void obs_sceneitem_addref(obs_sceneitem_t item)
{
return item ? ++item->ref : 0;
if (item)
++item->ref;
}
int obs_sceneitem_release(obs_sceneitem_t item)
void obs_sceneitem_release(obs_sceneitem_t item)
{
int ref = 0;
if (!item)
return;
if (item) {
ref = --item->ref;
if (!ref)
obs_sceneitem_destroy(item);
}
return ref;
if (--item->ref == 0)
obs_sceneitem_destroy(item);
}
void obs_sceneitem_remove(obs_sceneitem_t item)

19
libobs/obs-source.c
View file

@ -219,22 +219,19 @@ static void obs_source_destroy(obs_source_t source)
bfree(source);
}
int obs_source_addref(obs_source_t source)
void obs_source_addref(obs_source_t source)
{
return source ? ++source->refs : 0;
if (source)
++source->refs;
}
int obs_source_release(obs_source_t source)
void obs_source_release(obs_source_t source)
{
int refs = 0;
if (!source)
return;
if (source) {
refs = --source->refs;
if (refs == 0)
obs_source_destroy(source);
}
return refs;
if (--source->refs == 0)
obs_source_destroy(source);
}
void obs_source_remove(obs_source_t source)

12
libobs/obs.h
View file

@ -347,8 +347,8 @@ EXPORT obs_source_t obs_source_create(enum obs_source_type type,
* Adds/releases a reference to a source. When the last reference is
* released, the source is destroyed.
*/
EXPORT int obs_source_addref(obs_source_t source);
EXPORT int obs_source_release(obs_source_t source);
EXPORT void obs_source_addref(obs_source_t source);
EXPORT void obs_source_release(obs_source_t source);
/** Notifies all references that the source should be released */
EXPORT void obs_source_remove(obs_source_t source);
@ -458,8 +458,8 @@ EXPORT void obs_source_process_filter(obs_source_t filter,
*/
EXPORT obs_scene_t obs_scene_create(const char *name);
EXPORT int obs_scene_addref(obs_scene_t scene);
EXPORT int obs_scene_release(obs_scene_t scene);
EXPORT void obs_scene_addref(obs_scene_t scene);
EXPORT void obs_scene_release(obs_scene_t scene);
/** Gets the scene's source context */
EXPORT obs_source_t obs_scene_getsource(obs_scene_t scene);
@ -479,8 +479,8 @@ EXPORT void obs_scene_enum_items(obs_scene_t scene,
/** Adds/creates a new scene item for a source */
EXPORT obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source);
EXPORT int obs_sceneitem_addref(obs_sceneitem_t item);
EXPORT int obs_sceneitem_release(obs_sceneitem_t item);
EXPORT void obs_sceneitem_addref(obs_sceneitem_t item);
EXPORT void obs_sceneitem_release(obs_sceneitem_t item);
/** Removes a scene item. */
EXPORT void obs_sceneitem_remove(obs_sceneitem_t item);