From d8a434bcc86650b344a2dd904f84a6f9c73fc401 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Mon, 15 Mar 2021 19:33:31 +0100 Subject: [PATCH] obs-filters: Minor code cleanup Remove some unused variables, fix const qualifier and remove printfs. --- plugins/obs-filters/noise-suppress-filter.c | 6 ++---- plugins/obs-filters/nvafx-load.h | 2 +- plugins/obs-filters/obs-filters.c | 6 +----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/obs-filters/noise-suppress-filter.c b/plugins/obs-filters/noise-suppress-filter.c index cc7d81e8f..ea13ff6aa 100644 --- a/plugins/obs-filters/noise-suppress-filter.c +++ b/plugins/obs-filters/noise-suppress-filter.c @@ -108,8 +108,7 @@ struct noise_suppress_data { uint32_t sample_rate; float intensity_ratio; unsigned int num_samples_per_frame, num_channels; - const char *sdk_path; - const char *model; + char *model; /* Resampler */ audio_resampler_t *nvafx_resampler; @@ -487,13 +486,12 @@ static void *noise_suppress_create(obs_data_t *settings, obs_source_t *filter) size_t size = strlen(sdk_path) + strlen(file) + 1; char *buffer = (char *)bmalloc(size); - ng->sdk_path = sdk_path; strcpy(buffer, sdk_path); strcat(buffer, file); ng->model = buffer; ng->nvafx_enabled = true; - info("NVAFX SDK redist path was found here %s", ng->sdk_path); + info("NVAFX SDK redist path was found here %s", sdk_path); } #endif noise_suppress_update(ng, settings); diff --git a/plugins/obs-filters/nvafx-load.h b/plugins/obs-filters/nvafx-load.h index c835e283c..32562f4df 100644 --- a/plugins/obs-filters/nvafx-load.h +++ b/plugins/obs-filters/nvafx-load.h @@ -129,7 +129,7 @@ static bool nvafx_get_sdk_path(char buffer[MAX_PATH]) char value[MAX_PATH]; PVOID pvData = value; DWORD BufferSize = 8192; - LPDWORD pcbData; + LSTATUS status = RegGetValue( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), diff --git a/plugins/obs-filters/obs-filters.c b/plugins/obs-filters/obs-filters.c index d09212d3f..91393fce9 100644 --- a/plugins/obs-filters/obs-filters.c +++ b/plugins/obs-filters/obs-filters.c @@ -61,11 +61,7 @@ bool obs_module_load(void) #if NOISEREDUCTION_ENABLED #ifdef LIBNVAFX_ENABLED /* load nvidia audio fx dll */ - if (!load_nvafx()) { - printf("[noise suppress: Unable to load NVAudioEffects.dll.]"); - } else { - printf("[noise suppress: NVAudioEffects.dll loaded.]"); - } + load_nvafx(); #endif obs_register_source(&noise_suppress_filter); obs_register_source(&noise_suppress_filter_v2);