Rename some more files

This commit is contained in:
twinaphex 2015-01-12 22:11:13 +01:00
parent 73a1f5afbb
commit 11bcc24c58
12 changed files with 25 additions and 25 deletions

View File

@ -140,11 +140,11 @@ OBJ += frontend/frontend.o \
gfx/image/image_rpng.o \
gfx/fonts/fonts.o \
gfx/video_filter.o \
audio/resamplers/resampler.o \
audio/audio_resampler_driver.o \
audio/dsp_filter.o \
audio/resamplers/sinc.o \
audio/resamplers/nearest.o \
audio/resamplers/cc_resampler.o \
audio/drivers_resampler/sinc.o \
audio/drivers_resampler/nearest.o \
audio/drivers_resampler/cc_resampler.o \
location/drivers/nulllocation.o \
camera/drivers/nullcamera.o \
gfx/drivers/nullgfx.o \
@ -257,8 +257,8 @@ endif
# Audio Resamplers
ifeq ($(HAVE_NEON),1)
OBJ += audio/resamplers/sinc_neon.o
OBJ += audio/resamplers/cc_resampler_neon.o
OBJ += audio/drivers_resampler/sinc_neon.o
OBJ += audio/drivers_resampler/cc_resampler_neon.o
# When compiled without this, tries to attempt to compile sinc lerp,
# which will error out
#

View File

@ -29,8 +29,8 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(HAVE_NEON),1)
LOCAL_CFLAGS += -D__ARM_NEON__
LOCAL_SRC_FILES += $(RARCH_DIR)/audio/utils_neon.S.neon
LOCAL_SRC_FILES += $(RARCH_DIR)/audio/resamplers/sinc_neon.S.neon
LOCAL_SRC_FILES += $(RARCH_DIR)/audio/resamplers/cc_resampler_neon.S.neon
LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_neon.S.neon
LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon
endif
LOCAL_CFLAGS += -DSINC_LOWER_QUALITY

View File

@ -42,7 +42,7 @@
/* Begin PBXFileReference section */
501232C7192E5FB00063A359 /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = apple_gamecontroller.m; path = ../common/apple_gamecontroller.m; sourceTree = "<group>"; };
501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = "<group>"; };
501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/resamplers/sinc_neon.S; sourceTree = "<group>"; };
501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/drivers_resampler/sinc_neon.S; sourceTree = "<group>"; };
501232CD192E5FE30063A359 /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = utils_neon.S; path = ../../audio/utils_neon.S; sourceTree = "<group>"; };
501232D5192E60580063A359 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = platform.m; sourceTree = "<group>"; };
501232D7192E605F0063A359 /* browser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = browser.m; sourceTree = "<group>"; };
@ -52,7 +52,7 @@
5073C587196C0BA40026E146 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; };
5073C588196C0BA40026E146 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; };
50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = cc_resampler_neon.S; path = ../../audio/resamplers/cc_resampler_neon.S; sourceTree = "<group>"; };
50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = cc_resampler_neon.S; path = ../../audio/drivers_resampler/cc_resampler_neon.S; sourceTree = "<group>"; };
50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
6949E72219FABADC00CC7F42 /* CFExtensions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = "<group>"; };
696012F119F3389A006A1088 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };

View File

@ -14,9 +14,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "resampler.h"
#include "audio_resampler_driver.h"
#ifdef RARCH_INTERNAL
#include "../../performance.h"
#include "../performance.h"
#endif
#include <file/config_file_userdata.h>
#include <string.h>

View File

@ -15,8 +15,8 @@
*/
#ifndef __RARCH_RESAMPLER_H
#define __RARCH_RESAMPLER_H
#ifndef __AUDIO_RESAMPLER_DRIVER_H
#define __AUDIO_RESAMPLER_DRIVER_H
#ifdef __cplusplus
extern "C" {

View File

@ -15,10 +15,13 @@
/* Convoluted Cosine Resampler */
#include "resampler.h"
#include "../audio_resampler_driver.h"
#include <math.h>
#include <stdint.h>
#include <stdlib.h>
#ifdef __SSE__
#include <xmmintrin.h>
#endif
#if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL)
#include "../../general.h"
@ -212,9 +215,6 @@ static void *resampler_CC_init(const struct resampler_config *config,
#if defined(__SSE__)
#include <xmmintrin.h>
#define CC_RESAMPLER_IDENT "SSE"
static void resampler_CC_downsample(void *re_, struct resampler_data *data)

View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "resampler.h"
#include "../audio_resampler_driver.h"
#include <math.h>
#include <stdint.h>
#include <stdlib.h>

View File

@ -15,7 +15,7 @@
/* Bog-standard windowed SINC implementation. */
#include "resampler.h"
#include "../audio_resampler_driver.h"
#include <math.h>
#include <stdint.h>
#include <stdlib.h>

View File

@ -34,7 +34,7 @@
#include "osk/osk_driver.h"
#include "camera/camera_driver.h"
#include "location/location_driver.h"
#include "audio/resamplers/resampler.h"
#include "audio/audio_resampler_driver.h"
#include "record/record_driver.h"
#include "retro.h"

View File

@ -409,10 +409,10 @@ FIFO BUFFER
/*============================================================
AUDIO RESAMPLER
============================================================ */
#include "../audio/resamplers/resampler.c"
#include "../audio/resamplers/sinc.c"
#include "../audio/resamplers/nearest.c"
#include "../audio/resamplers/cc_resampler.c"
#include "../audio/audio_resampler_driver.c"
#include "../audio/drivers_resampler/sinc.c"
#include "../audio/drivers_resampler/nearest.c"
#include "../audio/drivers_resampler/cc_resampler.c"
/*============================================================
CAMERA