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

libobs: Call CoInitializeEx in libobs

Browse Source 
Due to the fact that certain modules may need COM on startup, initialize
COM by default in libobs.
This commit is contained in:
jp9000 2015-09-22 11:27:38 -07:00
parent 51c4480697
commit 088debdef4
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libobs/obs-windows.c
View File

@ -627,3 +627,13 @@ void reset_win32_symbol_paths(void)
dstr_free(&path_str);
da_free(paths);
}
void initialize_com(void)
{
CoInitializeEx(0, COINIT_MULTITHREADED);
}
void uninitialize_com(void)
{
CoUninitialize();
}

7
libobs/obs.c
View File

@ -718,6 +718,8 @@ static bool obs_init(const char *locale, const char *module_config_path,
#ifdef _WIN32
extern void initialize_crash_handler(void);
extern void initialize_com(void);
extern void uninitialize_com(void);
#endif
static const char *obs_startup_name = "obs_startup";
@ -735,6 +737,7 @@ bool obs_startup(const char *locale, const char *module_config_path,
#ifdef _WIN32
initialize_crash_handler();
initialize_com();
#endif
success = obs_init(locale, module_config_path, store);
@ -803,6 +806,10 @@ void obs_shutdown(void)
bfree(obs->locale);
bfree(obs);
obs = NULL;
#ifdef _WIN32
uninitialize_com();
#endif
}
bool obs_initialized(void)