From 261f1b72d4542b36cf59eeb70889ccc771fb0e96 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 7 Jan 2020 23:03:23 +0100
Subject: [PATCH] Remove separate null_resampler.c file and move it into
 audio_resampler.c

---
 Makefile.common                               |  1 -
 griffin/griffin.c                             |  1 -
 .../audio/resampler/audio_resampler.c         | 14 +++++
 .../audio/resampler/drivers/null_resampler.c  | 58 -------------------
 .../include/audio/audio_resampler.h           |  1 -
 5 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100644 libretro-common/audio/resampler/drivers/null_resampler.c

diff --git a/Makefile.common b/Makefile.common
index 0869e9ad7e..5f06d1e992 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -240,7 +240,6 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/audio/dsp_filter.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \
-       $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \
        $(LIBRETRO_COMM_DIR)/utils/md5.o \
        playlist.o \
        $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8a97a947e4..715ba35faf 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -769,7 +769,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/nearest_resampler.c"
-#include "../libretro-common/audio/resampler/drivers/null_resampler.c"
 #ifdef HAVE_CC_RESAMPLER
 #include "../audio/drivers_resampler/cc_resampler.c"
 #endif
diff --git a/libretro-common/audio/resampler/audio_resampler.c b/libretro-common/audio/resampler/audio_resampler.c
index 8d27f06932..18d137d0da 100644
--- a/libretro-common/audio/resampler/audio_resampler.c
+++ b/libretro-common/audio/resampler/audio_resampler.c
@@ -28,6 +28,20 @@
 
 #include <audio/audio_resampler.h>
 
+static void resampler_null_process(void *a, struct resampler_data *b) { }
+static void resampler_null_free(void *a) { }
+static void *resampler_null_init(const struct resampler_config *a, double b,
+      enum resampler_quality c, resampler_simd_mask_t d) { return (void*)0; }
+
+retro_resampler_t null_resampler = {
+   resampler_null_init,
+   resampler_null_process,
+   resampler_null_free,
+   RESAMPLER_API_VERSION,
+   "null",
+   "null"
+};
+
 static const retro_resampler_t *resampler_drivers[] = {
    &sinc_resampler,
 #ifdef HAVE_CC_RESAMPLER
diff --git a/libretro-common/audio/resampler/drivers/null_resampler.c b/libretro-common/audio/resampler/drivers/null_resampler.c
deleted file mode 100644
index f69a3babb7..0000000000
--- a/libretro-common/audio/resampler/drivers/null_resampler.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (null_resampler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <audio/audio_resampler.h>
-
-typedef struct rarch_null_resampler
-{
-   void *empty;
-} rarch_null_resampler_t;
-
-static void resampler_null_process(
-      void *re_, struct resampler_data *data)
-{
-}
-
-static void resampler_null_free(void *re_)
-{
-}
-
-static void *resampler_null_init(const struct resampler_config *config,
-      double bandwidth_mod,
-      enum resampler_quality quality,
-      resampler_simd_mask_t mask)
-{
-   return (void*)0;
-}
-
-retro_resampler_t null_resampler = {
-   resampler_null_init,
-   resampler_null_process,
-   resampler_null_free,
-   RESAMPLER_API_VERSION,
-   "null",
-   "null"
-};
diff --git a/libretro-common/include/audio/audio_resampler.h b/libretro-common/include/audio/audio_resampler.h
index 46eb426a20..f688857629 100644
--- a/libretro-common/include/audio/audio_resampler.h
+++ b/libretro-common/include/audio/audio_resampler.h
@@ -155,7 +155,6 @@ extern retro_resampler_t sinc_resampler;
 extern retro_resampler_t CC_resampler;
 #endif
 extern retro_resampler_t nearest_resampler;
-extern retro_resampler_t null_resampler;
 
 /**
  * audio_resampler_driver_find_handle: