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

Revert "Merge pull request #410 from bazukas/nix-modules" 

This reverts commit 92d800cc18, reversing
changes made to 35a4acede0.

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.
master
jp9000 2015-04-03 19:54:03 -07:00
parent 92d800cc18
commit ec0048e05e
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libobs/obs-nix.c
View File

@ -51,23 +51,8 @@ static const int module_patterns_size =
void add_default_module_paths(void) void add_default_module_paths(void)
{ {
char bin[512];
char data[512];
int ret;
for (int i = 0; i < module_patterns_size; i++) for (int i = 0; i < module_patterns_size; i++)
obs_add_module_path(module_bin[i], module_data[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);
} }
/* /*