conf: use getBoolBlockParam for block params, too
git-svn-id: https://svn.musicpd.org/mpd/trunk@6858 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
4a2122eaf4
commit
b2ae8da509
@ -84,9 +84,9 @@ static int alsa_initDriver(AudioOutput * audioOutput, ConfigParam * param)
|
||||
BlockParam *bp = getBlockParam(param, "device");
|
||||
ad->device = bp ? xstrdup(bp->value) : xstrdup("default");
|
||||
|
||||
if ((bp = getBlockParam(param, "use_mmap")) &&
|
||||
!strcasecmp(bp->value, "yes"))
|
||||
ad->useMmap = 1;
|
||||
ad->useMmap = getBoolBlockParam(param, "use_mmap", 1);
|
||||
if (ad->useMmap == CONF_BOOL_UNSET)
|
||||
ad->useMmap = 0;
|
||||
if ((bp = getBlockParam(param, "buffer_time")))
|
||||
ad->buffer_time = atoi(bp->value);
|
||||
if ((bp = getBlockParam(param, "period_time")))
|
||||
|
@ -124,7 +124,7 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param)
|
||||
char *user;
|
||||
char *name;
|
||||
BlockParam *blockParam;
|
||||
unsigned int public = 0;
|
||||
unsigned int public;
|
||||
|
||||
sd = newShoutData();
|
||||
|
||||
@ -154,15 +154,9 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param)
|
||||
checkBlockParam("name");
|
||||
name = blockParam->value;
|
||||
|
||||
blockParam = getBlockParam(param, "public");
|
||||
if (blockParam) {
|
||||
if (0 == strcmp(blockParam->value, "yes")) {
|
||||
public = 1;
|
||||
} else if (strcmp(blockParam->value, "no")) {
|
||||
FATAL("public \"%s\" is not \"yes\" or \"no\" at line "
|
||||
"%i\n", param->value, param->line);
|
||||
}
|
||||
}
|
||||
public = getBoolBlockParam(param, "public", 1);
|
||||
if (public == CONF_BOOL_UNSET)
|
||||
public = 0;
|
||||
|
||||
blockParam = getBlockParam(param, "user");
|
||||
if (blockParam)
|
||||
|
Loading…
Reference in New Issue
Block a user