diff --git a/Makefile b/Makefile index 93411aa690..62390aa1a3 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ OBJ = frontend/frontend.o \ gfx/image.o \ gfx/fonts/fonts.o \ gfx/fonts/bitmapfont.o \ - audio/hermite.o \ audio/resampler.o \ performance.o @@ -300,16 +299,15 @@ ifeq ($(HAVE_PYTHON), 1) OBJ += gfx/py_state/py_state.o endif -ifeq ($(HAVE_SINC), 1) - OBJ += audio/sinc.o +OBJ += audio/sinc.o - ifeq ($(HAVE_NEON),1) - OBJ += audio/sinc_neon.o - # When compiled without this, tries to attempt to compile sinc lerp, - # which will error out - DEFINES += -DSINC_LOWER_QUALITY - endif +ifeq ($(HAVE_NEON),1) + OBJ += audio/sinc_neon.o + # When compiled without this, tries to attempt to compile sinc lerp, + # which will error out + DEFINES += -DSINC_LOWER_QUALITY endif + OBJ += audio/utils.o ifeq ($(HAVE_NEON),1) OBJ += audio/utils_neon.o diff --git a/Makefile.ps3 b/Makefile.ps3 index 54670e8160..d140fc5302 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -116,7 +116,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_SINC -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/Makefile.wii b/Makefile.wii index c62edfcfda..a7f238e709 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -65,7 +65,7 @@ CFLAGS += -Iconsole/logger endif -CFLAGS += -std=gnu99 -DHAVE_SINC -DSINC_LOWER_QUALITY -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Wno-char-subscripts +CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Wno-char-subscripts ifeq ($(DEBUG), 1) CFLAGS += -O0 -g -DDEBUG diff --git a/Makefile.win b/Makefile.win index 71a73bf00c..1afe65e5c6 100644 --- a/Makefile.win +++ b/Makefile.win @@ -33,7 +33,6 @@ OBJ = frontend/frontend.o \ gfx/fonts/fonts.o \ gfx/fonts/bitmapfont.o \ gfx/image.o \ - audio/hermite.o \ audio/resampler.o \ performance.o @@ -57,7 +56,6 @@ HAVE_D3D9 = 1 HAVE_NETPLAY = 1 HAVE_STDIN_CMD = 1 HAVE_THREADS = 1 -HAVE_SINC = 1 HAVE_RGUI = 1 DYNAMIC = 1 @@ -223,10 +221,7 @@ ifeq ($(HAVE_FFMPEG), 1) OBJ += record/ffemu.o endif -ifeq ($(HAVE_SINC), 1) OBJ += audio/sinc.o - DEFINES += -DHAVE_SINC -endif ifneq ($(V), 1) Q := @ diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 65b277cb79..8e8114dda8 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -2,7 +2,6 @@ RARCH_VERSION = "0.9.8.4" LOCAL_PATH := $(call my-dir) PERF_TEST := 0 HAVE_NEON := 1 -HAVE_SINC := 1 HAVE_LOGGER := 1 include $(CLEAR_VARS) @@ -22,12 +21,10 @@ LOCAL_CFLAGS += -DHAVE_NEON LOCAL_SRC_FILES += ../../../audio/utils_neon.S.neon endif -ifeq ($(HAVE_SINC),1) ifeq ($(HAVE_NEON),1) LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon endif -LOCAL_CFLAGS += -DHAVE_SINC -DSINC_LOWER_QUALITY -endif +LOCAL_CFLAGS += -DSINC_LOWER_QUALITY LOCAL_CFLAGS += -DANDROID_ARM_V7 endif diff --git a/audio/hermite.c b/audio/hermite.c deleted file mode 100644 index a74e66d76a..0000000000 --- a/audio/hermite.c +++ /dev/null @@ -1,126 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2013 - Hans-Kristian Arntzen - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -// Hermite resampler based on bsnes' audio library. - -#include "resampler.h" -#include -#include -#include -#include "../boolean.h" - -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif - -#ifndef RESAMPLER_TEST -#include "../general.h" -#else -#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__) -#define RARCH_WARN(...) fprintf(stderr, __VA_ARGS__) -#endif - -#define CHANNELS 2 - -typedef struct rarch_hermite_resampler -{ - float chan_data[CHANNELS][4]; - double r_frac; -} rarch_hermite_resampler_t; - -static inline float hermite_kernel(float mu1, float a, float b, float c, float d) -{ - float mu2, mu3, m0, m1, a0, a1, a2, a3; - - mu2 = mu1 * mu1; - mu3 = mu2 * mu1; - - m0 = (c - a) * 0.5f; - m1 = (d - b) * 0.5f; - - a0 = +2 * mu3 - 3 * mu2 + 1; - a1 = mu3 - 2 * mu2 + mu1; - a2 = mu3 - mu2; - a3 = -2 * mu3 + 3 * mu2; - - return (a0 * b) + (a1 * m0) + (a2 * m1) + (a3 * c); -} - -void *resampler_hermite_new(double bandwidth_mod) -{ - if (bandwidth_mod < 1.0) - RARCH_WARN("Hermite resampler is likely to sound absolutely terrible when downsampling.\n"); - -#ifndef RESAMPLER_TEST - RARCH_LOG("Hermite resampler [C]\n"); -#endif - return calloc(1, sizeof(rarch_hermite_resampler_t)); -} - -static void resampler_hermite_process(void *re_, struct resampler_data *data) -{ - rarch_hermite_resampler_t *re = (rarch_hermite_resampler_t*)re_; - double r_step = 1.0 / data->ratio; - size_t processed_out = 0; - - size_t in_frames = data->input_frames; - const float *in_data = data->data_in; - float *out_data = data->data_out; - - size_t i = 0; - while (i < in_frames) - { - while (re->r_frac >= 1.0 && i < in_frames) - { - re->r_frac -= 1.0; - for (unsigned c = 0; c < CHANNELS; c++) - { - re->chan_data[c][0] = re->chan_data[c][1]; - re->chan_data[c][1] = re->chan_data[c][2]; - re->chan_data[c][2] = re->chan_data[c][3]; - re->chan_data[c][3] = *in_data++; - } - i++; - } - - while (re->r_frac <= 1.0) - { - re->r_frac += r_step; - for (unsigned c = 0; c < CHANNELS; c++) - { - float res = hermite_kernel((float)re->r_frac, - re->chan_data[c][0], re->chan_data[c][1], - re->chan_data[c][2], re->chan_data[c][3]); - *out_data++ = res; - } - processed_out++; - } - } - - data->output_frames = processed_out; -} - -static void resampler_hermite_free(void *re) -{ - free(re); -} - -const rarch_resampler_t hermite_resampler = { - resampler_hermite_new, - resampler_hermite_process, - resampler_hermite_free, - "hermite", -}; - diff --git a/audio/resampler.c b/audio/resampler.c index 644c23882a..8faa63e041 100644 --- a/audio/resampler.c +++ b/audio/resampler.c @@ -23,10 +23,7 @@ #include "../general.h" static const rarch_resampler_t *backends[] = { -#ifdef HAVE_SINC &sinc_resampler, -#endif - &hermite_resampler, }; bool rarch_resampler_realloc(void **re, const rarch_resampler_t **backend, const char *ident, double bw_ratio) diff --git a/audio/resampler.h b/audio/resampler.h index c5f803e8d7..ee4292588a 100644 --- a/audio/resampler.h +++ b/audio/resampler.h @@ -50,7 +50,6 @@ typedef struct rarch_resampler const char *ident; } rarch_resampler_t; -extern const rarch_resampler_t hermite_resampler; extern const rarch_resampler_t sinc_resampler; // Reallocs resampler. Will free previous handle before allocating a new one. diff --git a/audio/test/Makefile b/audio/test/Makefile index 10f700ba15..a1779b1937 100644 --- a/audio/test/Makefile +++ b/audio/test/Makefile @@ -1,6 +1,4 @@ -TESTS := test-hermite \ - test-snr-hermite \ - test-sinc-lowest \ +TESTS := test-sinc-lowest \ test-snr-sinc-lowest \ test-sinc-lower \ test-snr-sinc-lower \ @@ -16,64 +14,52 @@ LDFLAGS += -lm all: $(TESTS) -test-hermite: hermite.o ../utils.o main.o resampler-hermite.o - $(CC) -o $@ $^ $(LDFLAGS) - -test-snr-hermite: hermite.o ../utils.o snr.o resampler-hermite.o - $(CC) -o $@ $^ $(LDFLAGS) - resampler-sinc.o: ../resampler.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC - -resampler-hermite.o: ../resampler.c - $(CC) -c -o $@ $< $(CFLAGS) - -hermite.o: ../hermite.c $(CC) -c -o $@ $< $(CFLAGS) sinc-lowest.o: ../sinc.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC -DSINC_LOWEST_QUALITY + $(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY sinc-lower.o: ../sinc.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC -DSINC_LOWER_QUALITY + $(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY sinc.o: ../sinc.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC + $(CC) -c -o $@ $< $(CFLAGS) sinc-higher.o: ../sinc.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC -DSINC_HIGHER_QUALITY + $(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHER_QUALITY sinc-highest.o: ../sinc.c - $(CC) -c -o $@ $< $(CFLAGS) -DHAVE_SINC -DSINC_HIGHEST_QUALITY + $(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY -test-sinc-lowest: sinc-lowest.o ../utils.o main.o ../hermite.o resampler-sinc.o +test-sinc-lowest: sinc-lowest.o ../utils.o main.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-lowest: sinc-lowest.o ../utils.o snr.o ../hermite.o resampler-sinc.o +test-snr-sinc-lowest: sinc-lowest.o ../utils.o snr.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-lower: sinc-lower.o ../utils.o main.o ../hermite.o resampler-sinc.o +test-sinc-lower: sinc-lower.o ../utils.o main.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-lower: sinc-lower.o ../utils.o snr.o ../hermite.o resampler-sinc.o +test-snr-sinc-lower: sinc-lower.o ../utils.o snr.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-sinc: sinc.o ../utils.o main.o ../hermite.o resampler-sinc.o +test-sinc: sinc.o ../utils.o main.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc: sinc.o ../utils.o snr.o ../hermite.o resampler-sinc.o +test-snr-sinc: sinc.o ../utils.o snr.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-higher: sinc-higher.o ../utils.o main.o ../hermite.o resampler-sinc.o +test-sinc-higher: sinc-higher.o ../utils.o main.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-higher: sinc-higher.o ../utils.o snr.o ../hermite.o resampler-sinc.o +test-snr-sinc-higher: sinc-higher.o ../utils.o snr.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-highest: sinc-highest.o ../utils.o main.o ../hermite.o resampler-sinc.o +test-sinc-highest: sinc-highest.o ../utils.o main.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-highest: sinc-highest.o ../utils.o snr.o ../hermite.o resampler-sinc.o +test-snr-sinc-highest: sinc-highest.o ../utils.o snr.o resampler-sinc.o $(CC) -o $@ $^ $(LDFLAGS) %.o: %.c diff --git a/config.def.h b/config.def.h index c6e054da2a..bc5dc9c0e6 100644 --- a/config.def.h +++ b/config.def.h @@ -337,13 +337,6 @@ static const int out_latency = 64; // Will sync audio. (recommended) static const bool audio_sync = true; -// Default resampler -#ifdef HAVE_SINC -static const char *audio_resampler = "sinc"; -#else -static const char *audio_resampler = "hermite"; -#endif - // Experimental rate control #if defined(GEKKO) || !defined(RARCH_CONSOLE) static const bool rate_control = true; diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 2b590da05f..356b54efe0 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -460,12 +460,6 @@ static void render_text(rgui_handle_t *rgui) case RGUI_SETTINGS_AUDIO_CONTROL_RATE: snprintf(type_str, sizeof(type_str), "%.3f", g_settings.audio.rate_control_delta); break; - case RGUI_SETTINGS_RESAMPLER_TYPE: - if (strstr(g_settings.audio.resampler, "sinc")) - strlcpy(type_str, "Sinc", sizeof(type_str)); - else - strlcpy(type_str, "Hermite", sizeof(type_str)); - break; case RGUI_SETTINGS_SRAM_DIR: snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? "ON" : "OFF"); break; @@ -807,40 +801,6 @@ static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action, else if (action == RGUI_ACTION_RIGHT) settings_set(1ULL << S_AUDIO_CONTROL_RATE_INCREMENT); break; - case RGUI_SETTINGS_RESAMPLER_TYPE: - { - bool changed = false; - if (action == RGUI_ACTION_START) - { -#ifdef HAVE_SINC - strlcpy(g_settings.audio.resampler, "sinc", sizeof(g_settings.audio.resampler)); -#else - strlcpy(g_settings.audio.resampler, "hermite", sizeof(g_settings.audio.resampler)); -#endif - changed = true; - } - else if (action == RGUI_ACTION_LEFT || action == RGUI_ACTION_RIGHT) - { -#ifdef HAVE_SINC - if( strstr(g_settings.audio.resampler, "hermite")) - strlcpy(g_settings.audio.resampler, "sinc", sizeof(g_settings.audio.resampler)); - else -#endif - strlcpy(g_settings.audio.resampler, "hermite", sizeof(g_settings.audio.resampler)); - changed = true; - } - - if (g_extern.main_is_init && changed) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - } - break; case RGUI_SETTINGS_SRAM_DIR: if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); @@ -1030,7 +990,6 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui) rgui_list_push(rgui->selection_buf, "Rotation", RGUI_SETTINGS_VIDEO_ROTATION, 0); rgui_list_push(rgui->selection_buf, "Mute Audio", RGUI_SETTINGS_AUDIO_MUTE, 0); rgui_list_push(rgui->selection_buf, "Audio Control Rate", RGUI_SETTINGS_AUDIO_CONTROL_RATE, 0); - rgui_list_push(rgui->selection_buf, "Audio Resampler", RGUI_SETTINGS_RESAMPLER_TYPE, 0); #ifdef GEKKO rgui_list_push(rgui->selection_buf, "SRAM Saves in \"sram\" Dir", RGUI_SETTINGS_SRAM_DIR, 0); rgui_list_push(rgui->selection_buf, "State Saves in \"state\" Dir", RGUI_SETTINGS_STATE_DIR, 0); diff --git a/frontend/menu/rgui.h b/frontend/menu/rgui.h index 917b3a25c2..39dd45deec 100644 --- a/frontend/menu/rgui.h +++ b/frontend/menu/rgui.h @@ -57,7 +57,6 @@ typedef enum RGUI_SETTINGS_VIDEO_ROTATION, RGUI_SETTINGS_AUDIO_MUTE, RGUI_SETTINGS_AUDIO_CONTROL_RATE, - RGUI_SETTINGS_RESAMPLER_TYPE, RGUI_SETTINGS_ZIP_EXTRACT, RGUI_SETTINGS_SRAM_DIR, RGUI_SETTINGS_STATE_DIR, diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 11073d4868..4662366e88 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -557,21 +557,6 @@ static void populate_setting_item(void *data, unsigned input) strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); strlcpy(current_item->comment, "INFO - Set all [General Audio Settings] back to their 'DEFAULT' values.", sizeof(current_item->comment)); break; - case SETTING_RESAMPLER_TYPE: - strlcpy(current_item->text, "Sound resampler", sizeof(current_item->text)); -#ifdef HAVE_SINC - if (strstr(g_settings.audio.resampler, "sinc")) - { - strlcpy(current_item->setting_text, "Sinc", sizeof(current_item->setting_text)); - strlcpy(current_item->comment, "INFO - [Sinc resampler] - slightly slower but better sound quality at high frequencies.", sizeof(current_item->comment)); - } - else -#endif - { - strlcpy(current_item->setting_text, "Hermite", sizeof(current_item->setting_text)); - strlcpy(current_item->comment, "INFO - [Hermite resampler] - faster but less accurate at high frequencies.", sizeof(current_item->comment)); - } - break; case SETTING_EMU_CURRENT_SAVE_STATE_SLOT: strlcpy(current_item->text, "Current save state slot", sizeof(current_item->text)); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "%d", g_extern.state_slot); @@ -1877,46 +1862,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t return -1; } break; - case SETTING_RESAMPLER_TYPE: - if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) - { -#ifdef HAVE_SINC - if ( strstr(g_settings.audio.resampler, "hermite")) - strlcpy(g_settings.audio.resampler, "sinc", sizeof(g_settings.audio.resampler)); - else -#endif - strlcpy(g_settings.audio.resampler, "hermite", sizeof(g_settings.audio.resampler)); - - if (g_extern.main_is_init) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - - } - if (input & (1ULL << RMENU_DEVICE_NAV_START)) - { -#ifdef HAVE_SINC - strlcpy(g_settings.audio.resampler, "sinc", sizeof(g_settings.audio.resampler)); -#else - strlcpy(g_settings.audio.resampler, "hermite", sizeof(g_settings.audio.resampler)); -#endif - - if (g_extern.main_is_init) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - } - break; case SETTING_EMU_AUDIO_MUTE: if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) settings_set(1ULL << S_AUDIO_MUTE); diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h index d212b5b6b5..c224e41cd8 100644 --- a/frontend/menu/rmenu.h +++ b/frontend/menu/rmenu.h @@ -119,7 +119,6 @@ enum #ifdef HAVE_RSOUND SETTING_RSOUND_SERVER_IP_ADDRESS, #endif - SETTING_RESAMPLER_TYPE, SETTING_ENABLE_CUSTOM_BGM, SETTING_DEFAULT_AUDIO_ALL, SETTING_EMU_CURRENT_SAVE_STATE_SLOT, diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 98f54c921e..7b407411a2 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -677,7 +677,6 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); - m_settingslist.SetText(SETTING_AUDIO_RESAMPLER_TYPE, strstr(g_settings.audio.resampler, "sinc") ? L"Audio Resampler: Sinc" : L"Audio Resampler: Hermite"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); m_settingslist.SetText(SETTING_EMU_REWIND_GRANULARITY, strw_buffer); @@ -740,25 +739,6 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_AUDIO_RESAMPLER_TYPE: -#ifdef HAVE_SINC - if( strstr(g_settings.audio.resampler, "hermite")) - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "sinc"); - else -#endif - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "hermite"); - m_settingslist.SetText(SETTING_AUDIO_RESAMPLER_TYPE, strstr(g_settings.audio.resampler, "sinc") ? L"Audio Resampler: Sinc" : L"Audio Resampler: Hermite"); - - if (g_extern.main_is_init) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); @@ -829,25 +809,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_AUDIO_RESAMPLER_TYPE: -#ifdef HAVE_SINC - if( strstr(g_settings.audio.resampler, "hermite")) - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "sinc"); - else -#endif - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "hermite"); - m_settingslist.SetText(SETTING_AUDIO_RESAMPLER_TYPE, strstr(g_settings.audio.resampler, "sinc") ? L"Audio Resampler: Sinc" : L"Audio Resampler: Hermite"); - - if (g_extern.main_is_init) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); @@ -878,25 +839,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_AUDIO_RESAMPLER_TYPE: -#ifdef HAVE_SINC - if( strstr(g_settings.audio.resampler, "hermite")) - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "sinc"); - else -#endif - snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "hermite"); - m_settingslist.SetText(SETTING_AUDIO_RESAMPLER_TYPE, strstr(g_settings.audio.resampler, "sinc") ? L"Audio Resampler: Sinc" : L"Audio Resampler: Hermite"); - - if (g_extern.main_is_init) - { - if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, - g_settings.audio.resampler, g_extern.audio_data.orig_src_ratio == 0.0 ? 1.0 : g_extern.audio_data.orig_src_ratio)) - { - RARCH_ERR("Failed to initialize resampler \"%s\".\n", g_settings.audio.resampler); - g_extern.audio_active = false; - } - } - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); diff --git a/griffin/griffin.c b/griffin/griffin.c index 2579175ec5..dd9f6802bd 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -282,10 +282,7 @@ FIFO BUFFER AUDIO RESAMPLER ============================================================ */ #include "../audio/resampler.c" -#ifdef HAVE_SINC #include "../audio/sinc.c" -#endif -#include "../audio/hermite.c" /*============================================================ RSOUND diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj index daa6ce9c35..a13771beca 100644 --- a/ios/RetroArch.xcodeproj/project.pbxproj +++ b/ios/RetroArch.xcodeproj/project.pbxproj @@ -395,7 +395,6 @@ "-DHAVE_ZLIB", "-DWANT_MINIZ", "-DSINC_LOWER_QUALITY", - "-DHAVE_SINC", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -445,7 +444,6 @@ "-DHAVE_ZLIB", "-DWANT_MINIZ", "-DSINC_LOWER_QUALITY", - "-DHAVE_SINC", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -491,7 +489,6 @@ "-DHAVE_ZLIB", "-DWANT_MINIZ", "-DSINC_LOWER_QUALITY", - "-DHAVE_SINC", ); PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -540,7 +537,6 @@ "-DHAVE_ZLIB", "-DWANT_MINIZ", "-DSINC_LOWER_QUALITY", - "-DHAVE_SINC", ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index 233160c5f2..ac1ea95e7f 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE;HAVE_RMENU;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY;HAVE_XAUDIO + _DEBUG;_XBOX;HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE;HAVE_RMENU;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO Callcap @@ -151,7 +151,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;RARCH_CONSOLE;HAVE_RMENU;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;RARCH_CONSOLE;HAVE_RMENU;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY Callcap @@ -190,7 +190,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY;HAVE_XAUDIO + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO Callcap @@ -234,7 +234,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY;HAVE_RMENU;HAVE_XAUDIO + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU;HAVE_XAUDIO true @@ -275,7 +275,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE=1;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY;HAVE_RMENU;HAVE_XAUDIO + NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;HAVE_RARCH_MAIN_IMPLEMENTATION;RARCH_CONSOLE=1;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU;HAVE_XAUDIO true @@ -316,7 +316,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY;HAVE_XAUDIO + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.8.4";_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_FILEBROWSER;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360;HAVE_FBO;HAVE_SCREENSHOTS;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO true @@ -354,7 +354,6 @@ - diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters index 4ddd23508a..92b9db4632 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters @@ -106,9 +106,6 @@ Header Files\360 - - Header Files\audio - Header Files\audio diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index cab6bd1746..157d275418 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -22,7 +22,7 @@ Optimization="3" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" - PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY" + PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;SINC_LOWER_QUALITY" MinimalRebuild="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="1" @@ -72,7 +72,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;SINC_LOWER_QUALITY" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -127,7 +127,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;SINC_LOWER_QUALITY" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -188,7 +188,7 @@ EnableFiberSafeOptimizations="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;SINC_LOWER_QUALITY" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -241,7 +241,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;HAVE_SINC;SINC_LOWER_QUALITY" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_RMENU_GUI;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\"0.9.8.4\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_MAIN_IMPLEMENTATION;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8;HAVE_FILEBROWSER;WANT_MINIZ;SINC_LOWER_QUALITY" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index a8f53c963a..39867b2419 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -88,7 +88,7 @@ Level3 Disabled - WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI + WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -108,7 +108,7 @@ Level3 Disabled - WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI + WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -130,7 +130,7 @@ MaxSpeed true true - WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_SINC;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI + WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -154,7 +154,7 @@ MaxSpeed true true - WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;HAVE_ZLIB;WANT_MINIZ;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI + WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_MINIZ;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -173,7 +173,6 @@ - @@ -280,4 +279,4 @@ - \ No newline at end of file + diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters index 905020695b..cd7aac3733 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters @@ -198,9 +198,6 @@ Source Files\audio - - Source Files\audio - Source Files @@ -248,4 +245,4 @@ Resource Files - \ No newline at end of file + diff --git a/playbook/.cproject b/playbook/.cproject index d660743740..e05b378da3 100644 --- a/playbook/.cproject +++ b/playbook/.cproject @@ -45,7 +45,6 @@ - @@ -161,7 +160,6 @@ - @@ -278,7 +276,6 @@ - @@ -396,7 +393,6 @@ - @@ -512,7 +508,6 @@ - @@ -628,7 +623,6 @@ - @@ -745,7 +739,6 @@ - diff --git a/qb/config.params.sh b/qb/config.params.sh index fa038f16a9..2a6ea6556c 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -30,5 +30,4 @@ HAVE_FREETYPE=auto # Enable FreeType support HAVE_XVIDEO=auto # Enable XVideo support HAVE_SDL_IMAGE=auto # Enable SDL_image support HAVE_PYTHON=auto # Enable Python 3 support for shaders -HAVE_SINC=yes # Disable SINC resampler HAVE_BSV_MOVIE=yes # Disable BSV movie support diff --git a/retroarch.cfg b/retroarch.cfg index 5229b55091..f847e70c34 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -149,10 +149,6 @@ # Audio output samplerate. # audio_out_rate = 48000 -# Which resampler to use. "sinc" and "hermite" are currently implemented. -# Default will use "sinc" if compiled in. -# audio_resampler = - # When altering audio_in_rate on-the-fly, define by how much each time. # audio_rate_step = 0.25 diff --git a/settings.c b/settings.c index 0f27eb0aa2..e34a0e9481 100644 --- a/settings.c +++ b/settings.c @@ -199,7 +199,6 @@ void config_set_defaults(void) g_settings.audio.rate_control = rate_control; g_settings.audio.rate_control_delta = rate_control_delta; g_settings.audio.volume = audio_volume; - strlcpy(g_settings.audio.resampler, audio_resampler, sizeof(g_settings.audio.resampler)); g_settings.rewind_enable = rewind_enable; g_settings.rewind_buffer_size = rewind_buffer_size; @@ -620,7 +619,6 @@ bool config_load_file(const char *path) CONFIG_GET_BOOL(audio.rate_control, "audio_rate_control"); CONFIG_GET_FLOAT(audio.rate_control_delta, "audio_rate_control_delta"); CONFIG_GET_FLOAT(audio.volume, "audio_volume"); - CONFIG_GET_STRING(audio.resampler, "audio_resampler"); CONFIG_GET_STRING(video.driver, "video_driver"); CONFIG_GET_STRING(video.gl_context, "video_gl_context"); @@ -1155,7 +1153,6 @@ bool config_save_file(const char *path) config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control); config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta); config_set_string(conf, "system_directory", g_settings.system_directory); - config_set_string(conf, "audio_resampler", g_settings.audio.resampler); #ifdef ANDROID config_set_int(conf, "input_back_behavior", input.back_behavior);