|
@@ -113,7 +113,7 @@ int obs_open_module(obs_module_t **module, const char *path,
|
|
|
if (astrstri(path, "Library/Application Support/obs-studio") != NULL &&
|
|
|
astrstri(path, "obs-browser") != NULL) {
|
|
|
blog(LOG_WARNING, "Ignoring old obs-browser.so version");
|
|
|
- return MODULE_ERROR;
|
|
|
+ return MODULE_HARDCODED_SKIP;
|
|
|
}
|
|
|
#endif
|
|
|
|
|
@@ -307,10 +307,28 @@ static void load_all_callback(void *param, const struct obs_module_info2 *info)
|
|
|
}
|
|
|
|
|
|
int code = obs_open_module(&module, info->bin_path, info->data_path);
|
|
|
- if (code != MODULE_SUCCESS) {
|
|
|
- blog(LOG_DEBUG, "Failed to load module file '%s': %d",
|
|
|
- info->bin_path, code);
|
|
|
+ switch (code) {
|
|
|
+ case MODULE_MISSING_EXPORTS:
|
|
|
+ blog(LOG_DEBUG,
|
|
|
+ "Failed to load module file '%s', not an OBS plugin",
|
|
|
+ info->bin_path);
|
|
|
+ return;
|
|
|
+ case MODULE_FILE_NOT_FOUND:
|
|
|
+ blog(LOG_DEBUG,
|
|
|
+ "Failed to load module file '%s', file not found",
|
|
|
+ info->bin_path);
|
|
|
+ return;
|
|
|
+ case MODULE_ERROR:
|
|
|
+ blog(LOG_DEBUG, "Failed to load module file '%s'",
|
|
|
+ info->bin_path);
|
|
|
+ goto load_failure;
|
|
|
+ case MODULE_INCOMPATIBLE_VER:
|
|
|
+ blog(LOG_DEBUG,
|
|
|
+ "Failed to load module file '%s', incompatible version",
|
|
|
+ info->bin_path);
|
|
|
goto load_failure;
|
|
|
+ case MODULE_HARDCODED_SKIP:
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
if (!obs_init_module(module))
|