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

pulse: don't check config_param!=NULL

Browse Source 
The conf.h functions deal well with config_param==NULL and will return
the specified default value then.
This commit is contained in:
Max Kellermann 2009-03-26 19:50:02 +01:00
parent 74273d419a
commit cd4964cdee
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mixer/pulse_mixer.c
View File

@ -170,12 +170,9 @@ pulse_mixer_init(const struct config_param *param)
pm->volume = g_new(struct pa_cvolume,1);
pm->server = param != NULL
? config_dup_block_string(param, "server", NULL) : NULL;
pm->sink = param != NULL
? config_dup_block_string(param, "sink", NULL) : NULL;
pm->output_name = param != NULL
? config_dup_block_string(param, "name", NULL) : NULL;
pm->server = config_dup_block_string(param, "server", NULL);
pm->sink = config_dup_block_string(param, "sink", NULL);
pm->output_name = config_dup_block_string(param, "name", NULL);
return &pm->base;
}

6
src/output/pulse_plugin.c
View File

@ -70,10 +70,8 @@ pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format,
pd = pulse_new_data();
pd->name = config_get_block_string(param, "name", "mpd_pulse");
pd->server = param != NULL
? config_dup_block_string(param, "server", NULL) : NULL;
pd->sink = param != NULL
? config_dup_block_string(param, "sink", NULL) : NULL;
pd->server = config_dup_block_string(param, "server", NULL);
pd->sink = config_dup_block_string(param, "sink", NULL);
return pd;
}