From eaecc6d6f5861c774dba047d99680cc865ecb93c Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 7 Apr 2013 10:33:46 +0200 Subject: [PATCH] Remove some references to configurability of SINC. --- Makefile | 3 +-- Makefile.win | 3 +-- general.h | 1 - qb/config.libs.sh | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 62390aa1a3..62f297ecdd 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ OBJ = frontend/frontend.o \ gfx/fonts/fonts.o \ gfx/fonts/bitmapfont.o \ audio/resampler.o \ + audio/sinc.o \ performance.o JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ @@ -299,8 +300,6 @@ ifeq ($(HAVE_PYTHON), 1) OBJ += gfx/py_state/py_state.o endif -OBJ += audio/sinc.o - ifeq ($(HAVE_NEON),1) OBJ += audio/sinc_neon.o # When compiled without this, tries to attempt to compile sinc lerp, diff --git a/Makefile.win b/Makefile.win index 1afe65e5c6..7c294d4de9 100644 --- a/Makefile.win +++ b/Makefile.win @@ -34,6 +34,7 @@ OBJ = frontend/frontend.o \ gfx/fonts/bitmapfont.o \ gfx/image.o \ audio/resampler.o \ + audio/sinc.o \ performance.o JOBJ := conf/config_file.o \ @@ -221,8 +222,6 @@ ifeq ($(HAVE_FFMPEG), 1) OBJ += record/ffemu.o endif - OBJ += audio/sinc.o - ifneq ($(V), 1) Q := @ endif diff --git a/general.h b/general.h index 7299e53069..d8093a773d 100644 --- a/general.h +++ b/general.h @@ -221,7 +221,6 @@ struct settings bool rate_control; float rate_control_delta; float volume; // dB scale - char resampler[32]; } audio; diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 0268db9650..3551e558f2 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -208,6 +208,6 @@ check_macro NEON __ARM_NEON__ add_define_make OS "$OS" # Creates config.mk and config.h. -VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 SINC BSV_MOVIE VIDEOCORE NEON" +VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON" create_config_make config.mk $VARS create_config_header config.h $VARS