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

removed now-redundant callback enum_children from sources

Browse Source
This commit is contained in:
jp9000 2013-11-20 21:52:20 -07:00
parent f1decd08f4
commit 71890e0365
4 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libobs/obs-scene.c
View File

@ -107,7 +107,7 @@ static const struct source_info scene_info =
scene_video_render,
scene_getsize,
scene_getsize, NULL, NULL,
scene_enum_children, NULL, NULL
NULL, NULL
};
#else
static const struct source_info scene_info =
@ -120,7 +120,6 @@ static const struct source_info scene_info =
.video_render = scene_video_render,
.getwidth = scene_getsize,
.getheight = scene_getsize,
.enum_children = scene_enum_children
};
#endif

10
libobs/obs-source.c
View File

@ -58,8 +58,6 @@ bool get_source_info(void *module, const char *module_name,
source_name, "getparam", false);
info->setparam = load_module_subfunc(module, module_name,
source_name, "setparam", false);
info->enum_children = load_module_subfunc(module, module_name,
source_name, "enum_children", false);
info->filter_video = load_module_subfunc(module, module_name,
source_name, "filter_video", false);
@ -525,14 +523,6 @@ void obs_source_setparam(obs_source_t source, const char *param,
source->callbacks.setparam(source->data, param, data, size);
}
bool obs_source_enum_children(obs_source_t source, size_t idx,
obs_source_t *child)
{
if (source->callbacks.enum_children)
return source->callbacks.enum_children(source, idx, child);
return false;
}
obs_source_t obs_filter_gettarget(obs_source_t filter)
{
return filter->filter_target;

10
libobs/obs-source.h
View File

@ -134,14 +134,6 @@
* val: Value of parameter to set.
*
* ---------------------------------------------------------
* bool [name]_enum_children(void *data, size_t idx, obs_source_t *child);
* Enumerates child sources, if any.
*
* idx: Child source index.
* child: Pointer to variable that receives child source.
* Return value: true if sources remaining, otherwise false.
*
* ---------------------------------------------------------
* struct source_frame *[name]_filter_video(void *data,
* const struct source_frame *frame);
* Filters audio data. Used with audio filters.
@ -191,8 +183,6 @@ struct source_info {
void (*setparam)(void *data, const char *param, const void *data_in,
size_t size);
bool (*enum_children)(void *data, size_t idx, obs_source_t *child);
struct source_frame *(*filter_video)(void *data,
const struct source_frame *frame);
struct filtered_audio *(*filter_audio)(void *data,

6
libobs/obs.h
View File

@ -312,10 +312,6 @@ EXPORT size_t obs_source_getparam(obs_source_t source, const char *param,
EXPORT void obs_source_setparam(obs_source_t source, const char *param,
const void *data, size_t size);
/** Enumerates child sources this source has */
EXPORT bool obs_source_enum_children(obs_source_t source, size_t idx,
obs_source_t *child);
/** If the source is a filter, returns the target source of the filter */
EXPORT obs_source_t obs_filter_gettarget(obs_source_t filter);
@ -435,7 +431,7 @@ EXPORT obs_service_t obs_service_create(const char *service,
const char *settings);
EXPORT void obs_service_destroy(obs_service_t service);
EXPORT void obs_service_setdata(obs_service_t service, const char *attribute,
EXPORT void obs_service_setdata(obs_service_t service,const char *attribute,
const char *data);
EXPORT const char *obs_service_getdata(obs_service_t service,
const char *attribute);