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

obs-filters: Simplify NVAFX SDK path lookup

Browse Source
This commit is contained in:
Richard Stanway 2021-03-16 01:47:51 +01:00
parent d8a434bcc8
commit db7daa6eaf
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/obs-filters/noise-suppress-filter.c
View File

@ -478,7 +478,7 @@ static void *noise_suppress_create(obs_data_t *settings, obs_source_t *filter)
#ifdef LIBNVAFX_ENABLED
char sdk_path[MAX_PATH];
if (!nvafx_get_sdk_path(sdk_path)) {
if (!nvafx_get_sdk_path(sdk_path, sizeof(sdk_path))) {
ng->nvafx_enabled = false;
do_log(LOG_ERROR, "NVAFX redist is not installed.");
} else {

31
plugins/obs-filters/nvafx-load.h
View File

@ -124,39 +124,26 @@ void release_lib(void)
}
}
static bool nvafx_get_sdk_path(char buffer[MAX_PATH])
static bool nvafx_get_sdk_path(char *buffer, const size_t len)
{
char value[MAX_PATH];
PVOID pvData = value;
DWORD BufferSize = 8192;
DWORD ret =
GetEnvironmentVariableA("NVAFX_SDK_DIR", buffer, (DWORD)len);
LSTATUS status = RegGetValue(
HKEY_LOCAL_MACHINE,
TEXT("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"),
TEXT("NVAFX_SDK_DIR"), RRF_RT_REG_SZ, NULL, pvData,
&BufferSize);
if (!ret || ret >= len - 1)
return false;
if (status != ERROR_SUCCESS)
return false;
else if (!os_wcs_to_utf8((wchar_t *)pvData, 0, buffer, MAX_PATH))
return false;
return true;
}
static bool load_lib(void)
{
char buffer[MAX_PATH];
if (!nvafx_get_sdk_path(buffer))
char path[MAX_PATH];
if (!nvafx_get_sdk_path(path, sizeof(path)))
return false;
size_t length = strlen(buffer);
wchar_t path[MAX_PATH];
if (!os_utf8_to_wcs(buffer, 0, path, length + 1))
return false;
SetDllDirectory(path);
SetDllDirectoryA(path);
nv_audiofx = LoadLibrary(L"NVAudioEffects.dll");
SetDllDirectory(NULL);
SetDllDirectoryA(NULL);
return !!nv_audiofx;
}