From 598421e7d7855d41045d145ca9e3042864b5c597 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 9 Sep 2014 21:54:41 +0200 Subject: [PATCH] Move resampler drivers to audio/resamplers --- Makefile | 8 ++++---- Makefile.emscripten | 6 +++--- Makefile.openpandora | 2 +- Makefile.win | 6 +++--- audio/{ => resamplers}/cc_resampler.c | 2 +- audio/{ => resamplers}/resampler.c | 4 ++-- audio/{ => resamplers}/resampler.h | 4 ++-- audio/{ => resamplers}/sinc.c | 8 ++++---- audio/{ => resamplers}/sinc_neon.S | 0 driver.c | 1 - general.h | 2 +- griffin/griffin.c | 6 +++--- msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 6 +++--- msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters | 6 +++--- record/ffmpeg.c | 1 - 15 files changed, 30 insertions(+), 32 deletions(-) rename audio/{ => resamplers}/cc_resampler.c (99%) rename audio/{ => resamplers}/resampler.c (98%) rename audio/{ => resamplers}/resampler.h (97%) rename audio/{ => resamplers}/sinc.c (99%) rename audio/{ => resamplers}/sinc_neon.S (100%) diff --git a/Makefile b/Makefile index 22f246cdcf..9c5ba8dfe9 100644 --- a/Makefile +++ b/Makefile @@ -40,10 +40,10 @@ OBJ = frontend/frontend.o \ gfx/scaler/scaler_filter.o \ gfx/image/image_rpng.o \ gfx/fonts/fonts.o \ - audio/resampler.o \ + audio/resamplers/resampler.o \ audio/dsp_filter.o \ - audio/sinc.o \ - audio/cc_resampler.o \ + audio/resamplers/sinc.o \ + audio/resamplers/cc_resampler.o \ location/nulllocation.o \ camera/nullcamera.o \ gfx/nullgfx.o \ @@ -452,7 +452,7 @@ ifeq ($(HAVE_XKBCOMMON), 1) endif ifeq ($(HAVE_NEON),1) - OBJ += audio/sinc_neon.o + OBJ += audio/resamplers/sinc_neon.o # When compiled without this, tries to attempt to compile sinc lerp, # which will error out DEFINES += -DSINC_LOWER_QUALITY diff --git a/Makefile.emscripten b/Makefile.emscripten index f11ecbcc22..ac4ff79fc1 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -45,9 +45,9 @@ OBJ = frontend/platform/platform_emscripten.o \ gfx/fonts/bitmapfont.o \ gfx/image/image_rpng.o \ gfx/filter.o \ - audio/resampler.o \ - audio/sinc.o \ - audio/cc_resampler.o \ + audio/resamplers/resampler.o \ + audio/resamplers/sinc.o \ + audio/resamplers/cc_resampler.o \ audio/nullaudio.o \ performance.o \ core_info.o \ diff --git a/Makefile.openpandora b/Makefile.openpandora index 3e4f890bb6..f837719d3f 100644 --- a/Makefile.openpandora +++ b/Makefile.openpandora @@ -10,7 +10,7 @@ TARGET := retroarch-pandora LDDIRS = -L. -L$(PNDSDK)/usr/lib INCDIRS = -I. -I$(PNDSDK)/usr/include -OBJ = griffin/griffin.o audio/sinc_neon.o audio/utils_neon.o +OBJ = griffin/griffin.o audio/resamplers/sinc_neon.o audio/utils_neon.o LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound diff --git a/Makefile.win b/Makefile.win index 04a7e9ebc1..0e428ee709 100644 --- a/Makefile.win +++ b/Makefile.win @@ -45,10 +45,10 @@ OBJ = frontend/frontend.o \ gfx/fonts/fonts.o \ gfx/fonts/bitmapfont.o \ gfx/image/image_rpng.o \ - audio/resampler.o \ + audio/resamplers/resampler.o \ audio/dsp_filter.o \ - audio/sinc.o \ - audio/cc_resampler.o \ + audio/resamplers/sinc.o \ + audio/resamplers/cc_resampler.o \ location/nulllocation.o \ camera/nullcamera.o \ gfx/nullgfx.o \ diff --git a/audio/cc_resampler.c b/audio/resamplers/cc_resampler.c similarity index 99% rename from audio/cc_resampler.c rename to audio/resamplers/cc_resampler.c index 432de7b740..54df2a518d 100644 --- a/audio/cc_resampler.c +++ b/audio/resamplers/cc_resampler.c @@ -23,7 +23,7 @@ #include #if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL) -#include "../general.h" +#include "../../general.h" #else #define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__) #endif diff --git a/audio/resampler.c b/audio/resamplers/resampler.c similarity index 98% rename from audio/resampler.c rename to audio/resamplers/resampler.c index 876279d4ca..80f84e85b0 100644 --- a/audio/resampler.c +++ b/audio/resamplers/resampler.c @@ -17,10 +17,10 @@ #include #ifdef HAVE_CONFIG_H -#include "../config.h" +#include "../../config.h" #endif -#include "../general.h" +#include "../../general.h" static const rarch_resampler_t *resampler_drivers[] = { &sinc_resampler, diff --git a/audio/resampler.h b/audio/resamplers/resampler.h similarity index 97% rename from audio/resampler.h rename to audio/resamplers/resampler.h index 871be81ac3..7cf7cf042c 100644 --- a/audio/resampler.h +++ b/audio/resamplers/resampler.h @@ -18,13 +18,13 @@ #define __RARCH_RESAMPLER_H #ifdef HAVE_CONFIG_H -#include "../config.h" +#include "../../config.h" #endif #include #include #include -#include "../boolean.h" +#include "../../boolean.h" #ifndef M_PI /* M_PI is left out of ISO C99 :( */ diff --git a/audio/sinc.c b/audio/resamplers/sinc.c similarity index 99% rename from audio/sinc.c rename to audio/resamplers/sinc.c index 157086591c..01474d1e79 100644 --- a/audio/sinc.c +++ b/audio/resamplers/sinc.c @@ -16,17 +16,17 @@ // Bog-standard windowed SINC implementation. #include "resampler.h" -#include "../libretro.h" -#include "../performance.h" +#include "../../libretro.h" +#include "../../performance.h" #include #include #include #include #include -#include "../msvc/msvc_compat.h" +#include "../../msvc/msvc_compat.h" #ifndef RESAMPLER_TEST -#include "../general.h" +#include "../../general.h" #else #define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__) #endif diff --git a/audio/sinc_neon.S b/audio/resamplers/sinc_neon.S similarity index 100% rename from audio/sinc_neon.S rename to audio/resamplers/sinc_neon.S diff --git a/driver.c b/driver.c index d6f1547cab..fe423e34ee 100644 --- a/driver.c +++ b/driver.c @@ -24,7 +24,6 @@ #include #include "compat/posix_string.h" #include "audio/utils.h" -#include "audio/resampler.h" #include "gfx/thread_wrapper.h" #include "audio/thread_wrapper.h" #include "gfx/gfx_common.h" diff --git a/general.h b/general.h index db09f4731b..b062faa5af 100644 --- a/general.h +++ b/general.h @@ -82,7 +82,7 @@ #include "command.h" #endif -#include "audio/resampler.h" +#include "audio/resamplers/resampler.h" #ifdef __cplusplus extern "C" { diff --git a/griffin/griffin.c b/griffin/griffin.c index 08abfd3cf3..a184b47d72 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -355,10 +355,10 @@ FIFO BUFFER /*============================================================ AUDIO RESAMPLER ============================================================ */ -#include "../audio/resampler.c" -#include "../audio/sinc.c" +#include "../audio/resamplers/resampler.c" +#include "../audio/resamplers/sinc.c" #ifdef HAVE_CC_RESAMPLER -#include "../audio/cc_resampler.c" +#include "../audio/resamplers/cc_resampler.c" #endif /*============================================================ diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 2a5326741d..f5ea60bdfd 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -185,12 +185,12 @@ - + - - + + diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters index b9b3fd90ea..e1fc6bf591 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters @@ -48,13 +48,13 @@ gfx\glsym - + audio audio - + audio @@ -231,7 +231,7 @@ gfx - + audio diff --git a/record/ffmpeg.c b/record/ffmpeg.c index 7f5e040042..7c8a83f0fe 100644 --- a/record/ffmpeg.c +++ b/record/ffmpeg.c @@ -49,7 +49,6 @@ extern "C" { #include "../gfx/scaler/scaler.h" #include "../conf/config_file.h" #include "../audio/utils.h" -#include "../audio/resampler.h" #include "ffemu.h" #include