From b85839431d23d47dc71b3f178e3f7ec18b59178f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 20 Jul 1999 22:00:59 +0000 Subject: [PATCH] Mixer interface updates (group extensions).. --- include/mixer.h | 5 ++--- src/mixer/mixer.c | 32 ++++++++++---------------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/include/mixer.h b/include/mixer.h index 1eadd597..cc0379ff 100644 --- a/include/mixer.h +++ b/include/mixer.h @@ -26,12 +26,11 @@ int snd_mixer_info(snd_mixer_t *handle, snd_mixer_info_t * info); int snd_mixer_elements(snd_mixer_t *handle, snd_mixer_elements_t * elements); int snd_mixer_routes(snd_mixer_t *handle, snd_mixer_routes_t * routes); int snd_mixer_groups(snd_mixer_t *handle, snd_mixer_groups_t * groups); -int snd_mixer_group(snd_mixer_t *handle, snd_mixer_group_t * group); +int snd_mixer_group_read(snd_mixer_t *handle, snd_mixer_group_t * group); +int snd_mixer_group_write(snd_mixer_t *handle, snd_mixer_group_t * group); int snd_mixer_element_info(snd_mixer_t *handle, snd_mixer_element_info_t * info); int snd_mixer_element_read(snd_mixer_t *handle, snd_mixer_element_t * element); int snd_mixer_element_write(snd_mixer_t *handle, snd_mixer_element_t * element); -int snd_mixer_channel_read(snd_mixer_t *handle, snd_mixer_channels_t * channels); -int snd_mixer_channel_write(snd_mixer_t *handle, snd_mixer_channels_t * channels); int snd_mixer_read(snd_mixer_t *handle, snd_mixer_callbacks_t * callbacks); void snd_mixer_set_bit(unsigned int *bitmap, int bit, int val); diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index 897dfc3b..580ba11e 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -144,74 +144,62 @@ int snd_mixer_groups(snd_mixer_t *handle, snd_mixer_groups_t * groups) return 0; } -int snd_mixer_group(snd_mixer_t *handle, snd_mixer_group_t * group) +int snd_mixer_group_read(snd_mixer_t *handle, snd_mixer_group_t * group) { snd_mixer_t *mixer; mixer = handle; if (!mixer) return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_GROUP, group) < 0) + if (ioctl(mixer->fd, SND_MIXER_IOCTL_GROUP_READ, group) < 0) return -errno; return 0; } -int snd_mixer_element_info(snd_mixer_t *handle, snd_mixer_element_info_t * info) -{ - snd_mixer_t *mixer; - - mixer = handle; - if (!mixer) - return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_INFO, info) < 0) - return -errno; - return 0; -} - -int snd_mixer_element_read(snd_mixer_t *handle, snd_mixer_element_t * element) +int snd_mixer_group_write(snd_mixer_t *handle, snd_mixer_group_t * group) { snd_mixer_t *mixer; mixer = handle; if (!mixer) return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_READ, element) < 0) + if (ioctl(mixer->fd, SND_MIXER_IOCTL_GROUP_WRITE, group) < 0) return -errno; return 0; } -int snd_mixer_element_write(snd_mixer_t *handle, snd_mixer_element_t * element) +int snd_mixer_element_info(snd_mixer_t *handle, snd_mixer_element_info_t * info) { snd_mixer_t *mixer; mixer = handle; if (!mixer) return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_WRITE, element) < 0) + if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_INFO, info) < 0) return -errno; return 0; } -int snd_mixer_channel_read(snd_mixer_t *handle, snd_mixer_channels_t * channels) +int snd_mixer_element_read(snd_mixer_t *handle, snd_mixer_element_t * element) { snd_mixer_t *mixer; mixer = handle; if (!mixer) return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_CHANNEL_READ, channels) < 0) + if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_READ, element) < 0) return -errno; return 0; } -int snd_mixer_channel_write(snd_mixer_t *handle, snd_mixer_channels_t * channels) +int snd_mixer_element_write(snd_mixer_t *handle, snd_mixer_element_t * element) { snd_mixer_t *mixer; mixer = handle; if (!mixer) return -EINVAL; - if (ioctl(mixer->fd, SND_MIXER_IOCTL_CHANNEL_WRITE, channels) < 0) + if (ioctl(mixer->fd, SND_MIXER_IOCTL_ELEMENT_WRITE, element) < 0) return -errno; return 0; } -- 2.47.1