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

conf: replaced getBoolBlockParam() with config_get_block_bool()

Browse Source 
No "force" parameter, pass a default value instead.
This commit is contained in:
Max Kellermann 2009-01-17 20:23:56 +01:00
parent a1a97cc048
commit 7acc62366c
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf.c
View File

@ -449,20 +449,24 @@ bool config_get_bool(const char *name, bool default_value)
return !!value;
}
int
getBoolBlockParam(struct config_param *param, const char *name, int force)
bool
config_get_block_bool(struct config_param *param, const char *name,
bool default_value)
{
int ret;
struct block_param *bp = getBlockParam(param, name);
int value;
if (!bp)
return CONF_BOOL_UNSET;
if (bp == NULL)
return default_value;
ret = get_bool(bp->value);
if (force && ret == CONF_BOOL_INVALID)
value = get_bool(bp->value);
if (value == CONF_BOOL_INVALID)
g_error("%s is not a boolean value (yes, true, 1) or "
"(no, false, 0) on line %i\n",
bp->value, bp->line);
return ret;
}
name, bp->line);
if (value == CONF_BOOL_UNSET)
return default_value;
return !!value;
}

5
src/conf.h
View File

@ -108,8 +108,9 @@ parseConfigFilePath(const char *name, int force);
bool config_get_bool(const char *name, bool default_value);
int
getBoolBlockParam(struct config_param *param, const char *name, int force);
bool
config_get_block_bool(struct config_param *param, const char *name,
bool default_value);
struct config_param *
newConfigParam(const char *value, int line);

11
src/output/alsa_plugin.c
View File

@ -95,26 +95,25 @@ alsa_configure(AlsaData *ad, struct config_param *param)
if ((bp = getBlockParam(param, "device")))
ad->device = g_strdup(bp->value);
ad->useMmap = getBoolBlockParam(param, "use_mmap", 1);
if (ad->useMmap == CONF_BOOL_UNSET)
ad->useMmap = 0;
ad->useMmap = config_get_block_bool(param, "use_mmap", false);
if ((bp = getBlockParam(param, "buffer_time")))
ad->buffer_time = atoi(bp->value);
if ((bp = getBlockParam(param, "period_time")))
ad->period_time = atoi(bp->value);
#ifdef SND_PCM_NO_AUTO_RESAMPLE
if (!getBoolBlockParam(param, "auto_resample", true))
if (!config_get_block_bool(param, "auto_resample", true))
ad->mode |= SND_PCM_NO_AUTO_RESAMPLE;
#endif
#ifdef SND_PCM_NO_AUTO_CHANNELS
if (!getBoolBlockParam(param, "auto_channels", true))
if (!config_get_block_bool(param, "auto_channels", true))
ad->mode |= SND_PCM_NO_AUTO_CHANNELS;
#endif
#ifdef SND_PCM_NO_AUTO_FORMAT
if (!getBoolBlockParam(param, "auto_format", true))
if (!config_get_block_bool(param, "auto_format", true))
ad->mode |= SND_PCM_NO_AUTO_FORMAT;
#endif
}

4
src/output/shout_plugin.c
View File

@ -138,9 +138,7 @@ static void *my_shout_init_driver(struct audio_output *audio_output,
check_block_param("name");
name = block_param->value;
public = getBoolBlockParam(param, "public", 1);
if (public == CONF_BOOL_UNSET)
public = 0;
public = config_get_block_bool(param, "public", false);
block_param = getBlockParam(param, "user");
if (block_param)