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

libobs: Unload modules while OBS core is active

Browse Source 
Modules are now unloaded while OBS core is still active, allowing
modules that call into libobs in their unload function to continue to
work. This changes the behavior of such calls - previously they were a
no-op since the OBS core would be gone, but they are now executed with
the OBS core still being active.
This commit is contained in:
Richard Stanway 2020-06-01 15:54:46 +02:00
parent dd519123c6
commit b62ced9bf2
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libobs/obs.c
View File

@ -988,10 +988,6 @@ struct obs_cmdline_args obs_get_cmdline_args(void)
void obs_shutdown(void)
{
struct obs_module *module;
struct obs_core *core;
if (!obs)
return;
for (size_t i = 0; i < obs->source_types.num; i++) {
struct obs_source_info *item = &obs->source_types.array[i];
@ -1027,6 +1023,14 @@ void obs_shutdown(void)
stop_video();
stop_hotkeys();
module = obs->first_module;
while (module) {
struct obs_module *next = module->next;
free_module(module);
module = next;
}
obs->first_module = NULL;
obs_free_audio();
obs_free_data();
obs_free_video();
@ -1037,27 +1041,17 @@ void obs_shutdown(void)
obs->procs = NULL;
obs->signals = NULL;
core = obs;
for (size_t i = 0; i < obs->module_paths.num; i++)
free_module_path(obs->module_paths.array + i);
da_free(obs->module_paths);
if (obs->name_store_owned)
profiler_name_store_free(obs->name_store);
bfree(obs->module_config_path);
bfree(obs->locale);
bfree(obs);
obs = NULL;
module = core->first_module;
while (module) {
struct obs_module *next = module->next;
free_module(module);
module = next;
}
core->first_module = NULL;
for (size_t i = 0; i < core->module_paths.num; i++)
free_module_path(core->module_paths.array + i);
da_free(core->module_paths);
if (core->name_store_owned)
profiler_name_store_free(core->name_store);
bfree(core->module_config_path);
bfree(core->locale);
bfree(core);
bfree(cmdline_args.argv);
#ifdef _WIN32