diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-17 20:23:56 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-17 20:23:56 +0100 |
| commit | 7acc62366cb59aba414821563cc89e01e96c1987 (patch) | |
| tree | 67ad209293ec42de76ad2f12c09527f7d13698f1 /src/output | |
| parent | a1a97cc048a443eb71944848592b9827991600fd (diff) | |
| download | mpd-7acc62366cb59aba414821563cc89e01e96c1987.tar.gz mpd-7acc62366cb59aba414821563cc89e01e96c1987.tar.xz mpd-7acc62366cb59aba414821563cc89e01e96c1987.zip | |
conf: replaced getBoolBlockParam() with config_get_block_bool()
No "force" parameter, pass a default value instead.
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/alsa_plugin.c | 11 | ||||
| -rw-r--r-- | src/output/shout_plugin.c | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 0645b34b4..8034169ba 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -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 } diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index 5947f6e20..7ca885996 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -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) |