From 5c050864557d768a63c5d6252e6bcd915375e058 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 11 Feb 2015 02:40:18 +0100
Subject: [PATCH] Start updating audio/test

---
 audio/audio_utils.c |  4 +---
 audio/test/Makefile | 41 +++++++++++++++++++++--------------------
 audio/test/main.c   |  2 +-
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/audio/audio_utils.c b/audio/audio_utils.c
index 2c50fe0197..a703b2981e 100644
--- a/audio/audio_utils.c
+++ b/audio/audio_utils.c
@@ -25,10 +25,8 @@
 
 #ifdef RARCH_INTERNAL
 #include "../performance.h"
-#include "../libretro.h"
-#else
-#include "../libretro/libretro.h"
 #endif
+#include "libretro.h"
 
 /**
  * audio_convert_s16_to_float_C:
diff --git a/audio/test/Makefile b/audio/test/Makefile
index 4d772d0cc2..935e75abd7 100644
--- a/audio/test/Makefile
+++ b/audio/test/Makefile
@@ -13,15 +13,16 @@ TESTS := test-sinc-lowest \
 
 CFLAGS += -O3 -ffast-math -g -Wall -pedantic -march=native -std=gnu99
 CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG
+CFLAGS += -I../../libretro-sdk/include -I../../
 
 LDFLAGS += -lm
 
 all: $(TESTS)
 
-resampler-sinc.o: ../resamplers/resampler.c
+resampler-sinc.o: ../audio_resampler_driver.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-resampler-cc.o: ../resamplers/resampler.c
+resampler-cc.o: ../audio_resampler_driver.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
 
 main-cc.o: main.c
@@ -33,58 +34,58 @@ snr-cc.o: snr.c
 cc-resampler.o: ../resamplers/cc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-sinc-lowest.o: ../resamplers/sinc.c
+sinc-lowest.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY
 
-sinc-lower.o: ../resamplers/sinc.c
+sinc-lower.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY
 
-sinc.o: ../resamplers/sinc.c
+sinc.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-nearest.o: ../resamplers/nearest.c
+nearest.o: ../drivers_resampler/nearest.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-sinc-higher.o: ../resamplers/sinc.c
+sinc-higher.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHER_QUALITY
 
-sinc-highest.o: ../resamplers/sinc.c
+sinc-highest.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY
 
-test-sinc-lowest: sinc-lowest.o ../utils.o main.o resampler-sinc.o nearest.o
+test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-lowest: sinc-lowest.o ../utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-lower: sinc-lower.o ../utils.o main.o resampler-sinc.o nearest.o
+test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-lower: sinc-lower.o ../utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc: sinc.o ../utils.o main.o resampler-sinc.o nearest.o
+test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc: sinc.o ../utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-higher: sinc-higher.o ../utils.o main.o resampler-sinc.o nearest.o
+test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-higher: sinc-higher.o ../utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-highest: sinc-highest.o ../utils.o main.o resampler-sinc.o nearest.o
+test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-highest: sinc-highest.o ../utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-cc: cc-resampler.o ../utils.o main-cc.o resampler-cc.o sinc.o nearest.o
+test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-cc: cc-resampler.o ../utils.o snr-cc.o resampler-cc.o sinc.o nearest.o
+test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 %.o: %.c
diff --git a/audio/test/main.c b/audio/test/main.c
index 15e5bfc4e3..abecdba194 100644
--- a/audio/test/main.c
+++ b/audio/test/main.c
@@ -16,7 +16,7 @@
 // Resampler that reads raw S16NE/stereo from stdin and outputs to stdout in S16NE/stereo.
 // Used for testing and performance benchmarking.
 
-#include "../resamplers/resampler.h"
+#include "../audio_resampler_driver.h"
 #include "../audio_utils.h"
 #include <stdio.h>
 #include <stdlib.h>