mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor resampler.c

Browse Source
This commit is contained in:
twinaphex 2014-08-15 18:17:44 +02:00
parent e6e96cc74d
commit 49e9e97f38
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/resampler.c
View File

@ -22,7 +22,7 @@
#include "../general.h" #include "../general.h"
static const rarch_resampler_t *backends[] = { static const rarch_resampler_t *resampler_drivers[] = {
&sinc_resampler, &sinc_resampler,
#ifdef HAVE_CC_RESAMPLER #ifdef HAVE_CC_RESAMPLER
&CC_resampler, &CC_resampler,
@ -33,8 +33,8 @@ static const rarch_resampler_t *backends[] = {
static int find_resampler_driver_index(const char *driver) static int find_resampler_driver_index(const char *driver)
{ {
unsigned i; unsigned i;
for (i = 0; backends[i]; i++) for (i = 0; resampler_drivers[i]; i++)
if (strcasecmp(driver, backends[i]->ident) == 0) if (strcasecmp(driver, resampler_drivers[i]->ident) == 0)
return i; return i;
return -1; return -1;
} }
@ -42,21 +42,20 @@ static int find_resampler_driver_index(const char *driver)
// Resampler is used by multiple modules so avoid clobbering g_extern.audio_data.resampler here. // Resampler is used by multiple modules so avoid clobbering g_extern.audio_data.resampler here.
static const rarch_resampler_t *find_resampler_driver(const char *ident) static const rarch_resampler_t *find_resampler_driver(const char *ident)
{ {
if (!ident)
return backends[0];
int i = find_resampler_driver_index(ident); int i = find_resampler_driver_index(ident);
if (i >= 0) if (i >= 0)
return backends[i]; return resampler_drivers[i];
else else
{ {
unsigned d; unsigned d;
RARCH_ERR("Couldn't find any resampler driver named \"%s\"\n", ident); RARCH_ERR("Couldn't find any resampler driver named \"%s\"\n", ident);
RARCH_LOG_OUTPUT("Available resampler drivers are:\n"); RARCH_LOG_OUTPUT("Available resampler drivers are:\n");
for (d = 0; backends[d]; d++) for (d = 0; resampler_drivers[d]; d++)
RARCH_LOG_OUTPUT("\t%s\n", backends[d]->ident); RARCH_LOG_OUTPUT("\t%s\n", resampler_drivers[d]->ident);
RARCH_WARN("Going to default to first resampler driver ...\n"); RARCH_WARN("Going to default to first resampler driver ...\n");
return backends[0];
return resampler_drivers[0];
} }
} }
@ -65,7 +64,7 @@ void find_prev_resampler_driver(void)
{ {
int i = find_resampler_driver_index(g_settings.audio.resampler); int i = find_resampler_driver_index(g_settings.audio.resampler);
if (i > 0) if (i > 0)
strlcpy(g_settings.audio.resampler, backends[i - 1]->ident, sizeof(g_settings.audio.resampler)); strlcpy(g_settings.audio.resampler, resampler_drivers[i - 1]->ident, sizeof(g_settings.audio.resampler));
else else
RARCH_WARN("Couldn't find any previous resampler driver (current one: \"%s\").\n", g_extern.audio_data.resampler->ident); RARCH_WARN("Couldn't find any previous resampler driver (current one: \"%s\").\n", g_extern.audio_data.resampler->ident);
} }
@ -73,8 +72,8 @@ void find_prev_resampler_driver(void)
void find_next_resampler_driver(void) void find_next_resampler_driver(void)
{ {
int i = find_resampler_driver_index(g_settings.audio.resampler); int i = find_resampler_driver_index(g_settings.audio.resampler);
if (i >= 0 && backends[i + 1]) if (i >= 0 && resampler_drivers[i + 1])
strlcpy(g_settings.audio.resampler, backends[i + 1]->ident, sizeof(g_settings.audio.resampler)); strlcpy(g_settings.audio.resampler, resampler_drivers[i + 1]->ident, sizeof(g_settings.audio.resampler));
else else
RARCH_WARN("Couldn't find any next resampler driver (current one: \"%s\").\n", g_extern.audio_data.resampler->ident); RARCH_WARN("Couldn't find any next resampler driver (current one: \"%s\").\n", g_extern.audio_data.resampler->ident);
} }