From ec0048e05e6096b0e38f67dce6dd51289fbfdb56 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 3 Apr 2015 19:54:03 -0700 Subject: [PATCH] Revert "Merge pull request #410 from bazukas/nix-modules" This reverts commit 92d800cc1839cd8a86084a954ea115d8207449f8, reversing changes made to 35a4acede07ad260832b8f34bb074d4c0a368bcb. 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. --- libobs/obs-nix.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index 6f5696ca6..34dcc7e0f 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -51,23 +51,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); } /*