oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

jack: parse "ports" setting with g_strsplit()

Browse Source 
Don't modify the configured string.
This commit is contained in:
Max Kellermann 2009-01-18 19:24:14 +01:00
parent 86f6233f46
commit 73e466cfef
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/output/jack_plugin.c
View File

@ -189,7 +189,6 @@ mpd_jack_init(struct audio_output *ao,
struct block_param *bp; struct block_param *bp;
char *endptr; char *endptr;
int val; int val;
char *cp = NULL;
jd = mpd_jack_new(); jd = mpd_jack_new();
jd->ao = ao; jd->ao = ao;
@ -199,28 +198,16 @@ mpd_jack_init(struct audio_output *ao,
return jd; return jd;
if ( (bp = getBlockParam(param, "ports")) ) { if ( (bp = getBlockParam(param, "ports")) ) {
g_debug("output_ports=%s", bp->value); char **ports = g_strsplit(bp->value, ",", 0);
if (!(cp = strchr(bp->value, ','))) if (ports[0] == NULL || ports[1] == NULL || ports[2] != NULL)
g_error("expected comma and a second value for '%s' " g_error("two port names expected in line %d",
"at line %d: %s", bp->line);
bp->name, bp->line, bp->value);
*cp = '\0'; jd->output_ports[0] = ports[0];
jd->output_ports[0] = g_strdup(bp->value); jd->output_ports[1] = ports[1];
*cp++ = ',';
if (!*cp) g_free(ports);
g_error("expected a second value for '%s' at line %d: %s",
bp->name, bp->line, bp->value);
jd->output_ports[1] = g_strdup(cp);
if (strchr(cp,','))
g_error("Only %d values are supported for '%s' "
"at line %d",
(int)G_N_ELEMENTS(jd->output_ports),
bp->name, bp->line);
} }
if ( (bp = getBlockParam(param, "ringbuffer_size")) ) { if ( (bp = getBlockParam(param, "ringbuffer_size")) ) {