diff options
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/alsa_plugin.c | 8 | ||||
| -rw-r--r-- | src/output/oss_plugin.c | 6 |
2 files changed, 3 insertions, 11 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; } diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c index 0107dbdd2..33587be2c 100644 --- a/src/output/oss_plugin.c +++ b/src/output/oss_plugin.c @@ -278,8 +278,6 @@ static OssData *newOssData(void) supportParam(ret, SNDCTL_DSP_CHANNELS, 2); supportParam(ret, SNDCTL_DSP_SAMPLESIZE, 16); - ret->mixer = mixer_new(&oss_mixer); - return ret; } @@ -357,7 +355,7 @@ static void *oss_open_default(const struct config_param *param) if (ret[i] == 0) { OssData *od = newOssData(); od->device = default_devices[i]; - mixer_configure(od->mixer, param); + od->mixer = mixer_new(&oss_mixer, param); return od; } } @@ -398,7 +396,7 @@ oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput, if (device != NULL) { OssData *od = newOssData(); od->device = device; - mixer_configure(od->mixer, param); + od->mixer = mixer_new(&oss_mixer, param); return od; } |