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

Revert "libobs: Add UI-independent plugin search paths"

Browse Source 
This reverts commit 99c674e41f743e7a0cc1b7bb570a377f6553d973.

These commits were originally added to allow multiple user interfaces to
use the same plugins, but I soon realized that multiple user interfaces
can use multiple libobs versions, so each user interface should have its
own set of plugins to manage.  Some user interfaces may not wish to use
certain plugins anyway, so this fixes that issue as well.
This commit is contained in:
jp9000 2015-04-03 19:54:36 -07:00
parent ec0048e05e
commit 54535753ee
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libobs/obs-cocoa.c
View File

@ -46,23 +46,8 @@ static const int module_patterns_size =
void add_default_module_paths(void)
{
char bin[512];
char data[512];
int ret;
for (int i = 0; i < module_patterns_size; i++)
obs_add_module_path(module_bin[i], module_data[i]);
ret = os_get_config_path(bin, sizeof(bin), "obs-plugins/%module%");
if (ret <= 0)
return;
strcpy(data, bin);
strcat(data, "/data");
strcat(bin, "/bin");
obs_add_module_path(bin, data);
}
char *find_libobs_data_file(const char *file)

15
libobs/obs-windows.c
View File

@ -48,23 +48,8 @@ static const int module_patterns_size =
void add_default_module_paths(void)
{
char bin[512];
char data[512];
int ret;
for (int i = 0; i < module_patterns_size; i++)
obs_add_module_path(module_bin[i], module_data[i]);
ret = os_get_config_path(bin, sizeof(bin), "obs-plugins/%module%");
if (ret <= 0)
return;
strcpy(data, bin);
strcat(data, "/data");
strcat(bin, "/bin/" BIT_STRING);
obs_add_module_path(bin, data);
}
/* on windows, points to [base directory]/data/libobs */