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

conf: added config_get_block_string()

Browse Source 
This replaces lots of getBlockParam() invocations.
This commit is contained in:
Max Kellermann
2009-01-18 19:37:27 +01:00
parent 73e466cfef
commit a531a1e650
11 changed files with 95 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mixer/alsa_mixer.c
View File

@@ -46,18 +46,21 @@ static void
alsa_mixer_configure(struct mixer_data *data, struct config_param *param)
{
struct alsa_mixer *am = (struct alsa_mixer *)data;
struct block_param *bp;
const char *value;
if (param == NULL)
return;
if ((bp = getBlockParam(param, "mixer_device"))) {
value = config_get_block_string(param, "mixer_device", NULL);
if (value != NULL) {
g_free(am->device);
am->device = g_strdup(bp->value);
am->device = g_strdup(value);
}
if ((bp = getBlockParam(param, "mixer_control"))) {
value = config_get_block_string(param, "mixer_control", NULL);
if (value != NULL) {
g_free(am->control);
am->control = g_strdup(bp->value);
am->control = g_strdup(value);
}
}

14
src/mixer/oss_mixer.c
View File

@@ -50,21 +50,21 @@ static void
oss_mixer_configure(struct mixer_data *data, struct config_param *param)
{
struct oss_mixer *om = (struct oss_mixer *) data;
struct block_param *bp;
const char *value;
if (param == NULL)
return;
bp = getBlockParam(param, "mixer_device");
if (bp) {
value = config_get_block_string(param, "mixer_device", NULL);
if (value != NULL) {
g_free(om->device);
om->device = g_strdup(bp->value);
om->device = g_strdup(value);
}
bp = getBlockParam(param, "mixer_control");
if (bp) {
value = config_get_block_string(param, "mixer_control", NULL);
if (value != NULL) {
g_free(om->control);
om->control = g_strdup(bp->value);
om->control = g_strdup(value);
}
}