opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-29 18:12:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for modeless UI creation

Browse Source 
I realized that I had intended modeless UI to be usable by plugins, but
it had been pointed out to me that modeless really needs to return a
pointer/handle to the user interface object that was created.
This commit is contained in:
jp9000
2014-02-01 12:48:35 -07:00
parent 00a480f77d
commit b31d52d602
4 changed files with 98 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs.c
+27
View File
@@ -327,6 +327,7 @@ void obs_shutdown(void)
da_free(obs->output_types);
da_free(obs->service_types);
da_free(obs->ui_callbacks);
da_free(obs->ui_modeless_callbacks);
obs_free_data();
obs_free_video();
@@ -468,6 +469,22 @@ static inline struct ui_callback *get_ui_callback(const char *name,
return NULL;
}
static inline struct ui_modeless *get_modeless_ui_callback(const char *name,
const char *task, const char *target)
{
for (size_t i = 0; i < obs->ui_modeless_callbacks.num; i++) {
struct ui_modeless *callback;
callback = obs->ui_modeless_callbacks.array+i;
if (strcmp(callback->ui_info.name, name) == 0 &&
strcmp(callback->ui_info.task, task) == 0 &&
strcmp(callback->ui_info.target, target) == 0)
return callback;
}
return NULL;
}
int obs_call_ui(const char *name, const char *task, const char *target,
void *data, void *ui_data)
{
@@ -483,6 +500,16 @@ int obs_call_ui(const char *name, const char *task, const char *target,
return errorcode;
}
void *obs_create_ui(const char *name, const char *task, const char *target,
void *data, void *ui_data)
{
struct ui_modeless *callback;
int errorcode = OBS_UI_NOTFOUND;
callback = get_modeless_ui_callback(name, task, target);
return callback ? callback->callback(data, ui_data) : NULL;
}
bool obs_add_source(obs_source_t source)
{
struct calldata params = {0};