diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-25 17:37:59 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-25 17:37:59 +0100 |
| commit | 8695b9423233e9e8ad18ed7b4d56a020254fbdd6 (patch) | |
| tree | d8053ae96ef50e9ab69499b5e8a2702364974cfa /src/output/alsa_plugin.c | |
| parent | 763dd8c1dd4de451663474bafd13068eb6017bbb (diff) | |
| download | mpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.tar.gz mpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.tar.xz mpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.zip | |
mixer: removed mixer_configure(), configure mixer in mixer_new()
Allocate the mixer object when it is configured.
Merged mixer_configure() into mixer_new(). mixer_new() was quite
useless anyway.
Diffstat (limited to 'src/output/alsa_plugin.c')
| -rw-r--r-- | src/output/alsa_plugin.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index f08e99041..43ce99605 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -89,9 +89,6 @@ alsa_data_new(void) ret->pcm = NULL; ret->writei = snd_pcm_writei; - //use alsa mixer by default - ret->mixer = mixer_new(&alsa_mixer); - return ret; } @@ -146,10 +143,7 @@ alsa_init(G_GNUC_UNUSED struct audio_output *ao, } alsa_configure(ad, param); - - if (param) { - mixer_configure(ad->mixer, param); - } + ad->mixer = mixer_new(&alsa_mixer, param); return ad; } |