From 54535753ee00aef4981add3a680c19849545f607 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 3 Apr 2015 19:54:36 -0700 Subject: [PATCH] Revert "libobs: Add UI-independent plugin search paths" 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. --- libobs/obs-cocoa.c | 15 --------------- libobs/obs-windows.c | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/libobs/obs-cocoa.c b/libobs/obs-cocoa.c index 7c8b64a8b..9fbbe5a6a 100644 --- a/libobs/obs-cocoa.c +++ b/libobs/obs-cocoa.c @@ -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) diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c index 48c54c452..2a780d682 100644 --- a/libobs/obs-windows.c +++ b/libobs/obs-windows.c @@ -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 */