Skip to content

M
mpd
Commit dba45a59 authored by J. Alexander Treuman's avatar J. Alexander Treuman
Browse files
Options

Cleaning up pcm_getSampleRateConverter.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6275 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 665ab837
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 23 deletions
src/pcm_utils.c
View file @ dba45a59
...@@ -151,32 +151,36 @@ void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1, ...@@ -151,32 +151,36 @@ void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1,
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
static int pcm_getSampleRateConverter(void) static int pcm_getSampleRateConverter(void)
{ {
const char *conf, *test; const char *conf = getConfigParamValue(CONF_SAMPLERATE_CONVERTER);
int convalgo = SRC_SINC_FASTEST; long convalgo;
int newalgo; char *test;
size_t len; size_t len;
conf = getConfigParamValue(CONF_SAMPLERATE_CONVERTER); if (!conf) {
if(conf) { convalgo = SRC_SINC_FASTEST;
newalgo = strtol(conf, (char **)&test, 10); goto out;
if(*test) { }
len = strlen(conf);
for(newalgo = 0; ; newalgo++) { convalgo = strtol(conf, &test, 10);
test = src_get_name(newalgo); if (*test == '\0' && src_get_name(convalgo))
if(!test) goto out;
break; /* FAIL */
if(!strncasecmp(test, conf, len)) { len = strlen(conf);
convalgo = newalgo; for (convalgo = 0 ; ; convalgo++) {
break; test = (char *)src_get_name(convalgo);
} if (!test) {
} convalgo = SRC_SINC_FASTEST;
} else { break;
if(src_get_name(newalgo))
convalgo = newalgo;
/* else FAIL */
} }
if (strncasecmp(test, conf, len) == 0)
goto out;
} }
DEBUG("Selecting samplerate converter '%s'\n", src_get_name(convalgo));
ERROR("unknown samplerate converter \"%s\"\n", conf);
out:
DEBUG("selecting samplerate converter \"%s\"\n",
src_get_name(convalgo));
return convalgo; return convalgo;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment