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/oss_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/oss_plugin.c')
| -rw-r--r-- | src/output/oss_plugin.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |