diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-25 16:04:03 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-25 16:04:03 +0100 |
| commit | 3635c93acbc3da87880e886d924020c427d1774a (patch) | |
| tree | 4143b680e78794866744b3ac1d0a721d738872c2 /src/output/alsa_plugin.c | |
| parent | 5f7791009790dc40f2d76be310ffeab55c242ced (diff) | |
| download | mpd-3635c93acbc3da87880e886d924020c427d1774a.tar.gz mpd-3635c93acbc3da87880e886d924020c427d1774a.tar.xz mpd-3635c93acbc3da87880e886d924020c427d1774a.zip | |
conf: allow param==NULL
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.
Diffstat (limited to 'src/output/alsa_plugin.c')
| -rw-r--r-- | src/output/alsa_plugin.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 536d399d1..23a9089cd 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -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); } |