From cdb45a38d3f6cb171d5ff152c828ca689280b40e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 30 Jan 2017 18:43:09 +0100 Subject: [PATCH] Refactor code - do away with sinc_resampler_common --- Makefile.common | 1 - griffin/griffin.c | 1 - .../audio/resampler/drivers/sinc_resampler.c | 385 +++++++++++++++++- .../resampler/drivers/sinc_resampler_common.c | 99 ----- .../resampler/drivers/sinc_resampler_common.h | 322 --------------- 5 files changed, 364 insertions(+), 444 deletions(-) delete mode 100644 libretro-common/audio/resampler/drivers/sinc_resampler_common.c delete mode 100644 libretro-common/audio/resampler/drivers/sinc_resampler_common.h diff --git a/Makefile.common b/Makefile.common index 143babf270..47443fdd51 100644 --- a/Makefile.common +++ b/Makefile.common @@ -231,7 +231,6 @@ OBJ += frontend/frontend.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/audio_resampler.o \ $(LIBRETRO_COMM_DIR)/audio/dsp_filter.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \ - $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_common.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \ location/drivers/nulllocation.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 0a9bc92d5a..639ce86bb3 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -573,7 +573,6 @@ AUDIO RESAMPLER ============================================================ */ #include "../libretro-common/audio/resampler/audio_resampler.c" #include "../libretro-common/audio/resampler/drivers/sinc_resampler.c" -#include "../libretro-common/audio/resampler/drivers/sinc_resampler_common.c" #include "../libretro-common/audio/resampler/drivers/nearest_resampler.c" #include "../libretro-common/audio/resampler/drivers/null_resampler.c" #ifdef HAVE_CC_RESAMPLER diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler.c b/libretro-common/audio/resampler/drivers/sinc_resampler.c index 6b0da074e4..068d8244e7 100644 --- a/libretro-common/audio/resampler/drivers/sinc_resampler.c +++ b/libretro-common/audio/resampler/drivers/sinc_resampler.c @@ -32,47 +32,390 @@ #include #include