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

conf: allow param==NULL

Browse Source 
Return the default value in the conf_get_block_*() functions when
param==NULL was passed.

This simplifies a lot of code, because all initialization can be done
in one code path, regardless whether configuration is present.
This commit is contained in:
Max Kellermann
2009-01-25 16:04:03 +01:00
parent 5f77910097
commit 3635c93acb
6 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/output/alsa_plugin.c
+2 -5
View File
@@ -85,13 +85,9 @@ alsa_data_new(void)
{
struct alsa_data *ret = g_new(struct alsa_data, 1);
ret->device = NULL;
ret->mode = 0;
ret->pcm = NULL;
ret->writei = snd_pcm_writei;
ret->use_mmap = false;
ret->buffer_time = MPD_ALSA_BUFFER_TIME_US;
ret->period_time = MPD_ALSA_PERIOD_TIME_US;
//use alsa mixer by default
mixer_init(&ret->mixer, &alsa_mixer);
@@ -149,8 +145,9 @@ alsa_init(G_GNUC_UNUSED struct audio_output *ao,
free_global_registered = 1;
}
alsa_configure(ad, param);
if (param) {
alsa_configure(ad, param);
mixer_configure(&ad->mixer, param);
}