July 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2 0/3] Remove support for SNDRV_CTL_ELEM_ACCESS_USER & minor fix
by mengdong.lin＠linux.intel.com 20 Jul '16

20 Jul '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> There is no ABI change in this series. Remove support for control flag SNDRV_CTL_ELEM_ACCESS_USER as Takashi Sakamoto suggested. Also fix 2 compiler warnings and add check before string cpy. History: v2: Revise commit messages. Mengdong Lin (3): topology: Remove support for control flag SNDRV_CTL_ELEM_ACCESS_USER topology: Add ATTRIBUTE_UNUSED for unused parameters to fix compiler warning topology: Check address and length before string copy src/topology/ctl.c | 1 - src/topology/pcm.c | 8 ++++---- src/topology/tplg_local.h | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) -- 2.5.0

4 6

[alsa-devel] [PATCH] alsabat: make snr_is_valid static
by Vinod Koul 20 Jul '16

20 Jul '16

The compilation fails due to multiple defination of snr_is_valid common.o: In function `snr_is_valid': bat/common.h:99: multiple definition of `snr_is_valid' bat.o:bat/common.h:99: first defined here signal.o: In function `snr_is_valid': bat/common.h:99: multiple definition of `snr_is_valid' bat.o:bat/common.h:99: first defined here latencytest.o: In function `snr_is_valid': bat/common.h:99: multiple definition of `snr_is_valid' bat.o:bat/common.h:99: first defined here analyze.o: In function `snr_is_valid': bat/common.h:99: multiple definition of `snr_is_valid' bat.o:bat/common.h:99: first defined here alsa.o: In function `snr_is_valid': bat/common.h:99: multiple definition of `snr_is_valid' bat.o:bat/common.h:99: first defined here Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- bat/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat/common.h b/bat/common.h index db49868a419a..1b07fbeb7755 100644 --- a/bat/common.h +++ b/bat/common.h @@ -94,7 +94,7 @@ #define SNR_DB_MIN 0.0 #define SNR_DB_MAX 200.0 -inline bool snr_is_valid(float db) +static inline bool snr_is_valid(float db) { return (db > SNR_DB_MIN && db < SNR_DB_MAX); } -- 1.9.1

2 1

Re: [alsa-devel] [Question][ASoC][Topology] Question about ASoC Topology
by Mengdong Lin 20 Jul '16

20 Jul '16

Hi Takashi, Thanks for your explanation on how topology works! I cc the ML since potential users may also benefit from this info. Hi Lee, Now Intel SKL (Skylake) audio driver is using topology, which might be a reference for you. For the text conf file in user space, please see alsa-lib/src/conf/topology/sklrt286/skl_i2s.conf. The topology user space tool alsatplg will generate the SKL topology binary file for kernel. The doxygen doc also introduces the syntax. Besides the text conf file, you may also define topology objects by C API, declared in alsa-lib/include/topology.h For how the SKL platform driver loads the toplogy binary file, please see the kernel src code: sound/soc/intel/skylake/skl-topology.c, where snd_soc_tplg_component_load() is called to load the topology info and trigger ops binding in kernel. Now the upstreamed topology code support: controls, widgets, routes and PCM (Front-ends DAI & DAI links). And now we're upstreaming support for Back-end DAIs and BE links. This may be bring some ABI update and last for several weeks. You may try using topology atm, but you'll need to rebuild your topology binary info after the ABI update. I'll keep you updated when it's done. If you have any further questions, please let us know. Thanks Mengdong On 07/18/2016 03:19 PM, Takashi Sakamoto wrote: > Hi, > > (C.C.ed to Intel developers, who committed to ALSA topology feature.) > > On Jul 18 2016 14:07, 이경택 wrote: >> At first, sorry about interrupting you and thank you for giving your >> attention to an email from stranger. > > No worry. > >> I'm a software engineer in Samsung and writing a device driver for >> our audio. >> >> In recent kernel source code(version 4.4), I found out there is a new >> feature called topology. >> >> I thought that it is a framework for seperating data and logic of audio >> drivers, >> >> so I wanted to write my driver on that framework. >> >> But, it is hard to find out a starting point. (example, documentation, >> ......) >> >> If you give me an starting point, it would be very helpful to me. > > The feature of 'topology' was originally developed by Intel developers. > So I think it better to ask your questions to them. > > > As long as I know, the original goal of this feature is to write > parsable blobs for new HDA driver to PCH in Skylake architecture > (Skylake, Kabylake, etc). > > The new HDA driver (snd-soc-skl) doesn't directly enumerate widgets in > HDA codecs at all. Instead, the parsable blob represents the codec > internal. As a result of parsing the blob, some control elements, some > DAI links and so on are added. When you're interested in the functions > to add them, please start at soc_tplg_load_header(). > http://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/tree/sound/soc/… > > In kernel driver side, the blobs are loaded by usual way; > request_firmware(). > https://www.kernel.org/doc/Documentation/firmware_class/README > > Then, each kernel drivers parse the image by snd_soc_tplg_component_load(). > http://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/tree/sound/soc/… > > Of cource, you need to put the blobs to typical file path; /lib/firmware. > > > When writing files to generate the blob, you need to check two items; > one is UAPI of ASoC (include/uapi/sound/asoc.h) and another is runtime > configuration of ALSA userspace library. > > What you can do via topology feature is defined in the UAPI header. The > way to describe them to files is the same way as runtime configuration > of ALSA userspace library. > http://www.alsa-project.org/alsa-doc/alsa-lib/conf.html > > When you write the files, you can generate the blobs by 'alsatplg' utils > in alsa-utils.git. I believe it can detect parse errors. > http://git.alsa-project.org/?p=alsa-utils.git;a=tree;f=topology > > That's all of what I know. I hope this will help you or you can get > enough support about the new feature from Intel developers. > > p.s. I'm committing to ALSA in my private time, so I sometimes need to > stop discussions because of my limited time. I'm not a developer belongs > to semi-conductors or hardware vendors and have paid work for my life. > > > Regards > > Takashi Sakamoto >

1 0

Re: [alsa-devel] [PATCH 3/3] topology: Check address and length before string copy
by Lin, Mengdong 19 Jul '16

19 Jul '16

> -----Original Message----- > From: Takashi Sakamoto [mailto:o-takashi@sakamocchi.jp] > Sent: Tuesday, July 19, 2016 5:45 PM > To: mengdong.lin(a)linux.intel.com; alsa-devel(a)alsa-project.org; > broonie(a)kernel.org > Cc: tiwai(a)suse.de; Girdwood, Liam R; Lin, Mengdong > Subject: Re: [PATCH 3/3] topology: Check address and length before string > copy > > Hi, > > On Jul 19 2016 17:52, mengdong.lin(a)linux.intel.com wrote: > > From: Mengdong Lin <mengdong.lin(a)linux.intel.com> > > > > Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> > > The cover letter addresses this patch fixes a compiler warning. In this case, > it's better to write the message in commit message, I think. Like: > http://mailman.alsa-project.org/pipermail/alsa-devel/2016-July/110097.ht > ml > > This is not just from my taste. Maintainers prefer. At least, blank commit > messages are not preferrable in general. Yes, that would be better. I'll fix this in v2 tomorrow. Thanks Mengdong > > > diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h > > index 4d79aa7..cfde4cc 100644 > > --- a/src/topology/tplg_local.h > > +++ b/src/topology/tplg_local.h > > @@ -253,6 +253,9 @@ struct tplg_elem* > tplg_elem_new_common(snd_tplg_t > > *tplg, > > > > static inline void elem_copy_text(char *dest, const char *src, int len) > > { > > + if (!dest || !src || !len) > > + return; > > + > > strncpy(dest, src, len); > > dest[len - 1] = 0; > > } > > > Regards > > Takashi Sakamoto

1 0

[alsa-devel] [PATCH 0/3] Remove support for SNDRV_CTL_ELEM_ACCESS_USER & minor fix
by mengdong.lin＠linux.intel.com 19 Jul '16

19 Jul '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> There is no ABI change in this series. Remove support for control flag SNDRV_CTL_ELEM_ACCESS_USER as Takashi Sakamoto suggested. Also fix 2 compiler warnings and add check before string cpy. Mengdong Lin (3): topology: Remove support for control flag SNDRV_CTL_ELEM_ACCESS_USER topology: Fix compiler warnings topology: Check address and length before string copy src/topology/ctl.c | 1 - src/topology/pcm.c | 8 ++++---- src/topology/tplg_local.h | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) -- 2.5.0

1 3

[alsa-devel] [PATCH v2 0/5] topology: Enhance support for private data
by mengdong.lin＠linux.intel.com 19 Jul '16

19 Jul '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> There is no ABI change in this series. We finished verification on latest Intel platforms. There will be 4 or 5 series. Later series will come with some ABI update for topology. The size check on ABI objects in current ASoC kernel will detect possible ABI version mismatch between user space and kernel History: v2: fix compiler warnings. There are 2 warnings left in topology/pcm.c that are not caused by this series and will be fixed in later patches. Mengdong Lin (5): topology: An element can refer to multipe data sections in text conf file topology: Merge lookup for data reference into tplg_copy_data() topology: Change uuid value to 16 separate characters in text conf file topology: Parse vendor private data for manifest topology: Tuple type can have an extenstion include/topology.h | 69 ++++++++++- src/topology/ctl.c | 52 +++----- src/topology/dapm.c | 17 ++- src/topology/data.c | 307 ++++++++++++++++++++++++++++++++++++++-------- src/topology/elem.c | 4 + src/topology/parser.c | 28 ++++- src/topology/tplg_local.h | 15 ++- 7 files changed, 395 insertions(+), 97 deletions(-) -- 2.5.0

6 13

[alsa-devel] Alsa Soc details
by Chemsi Mehdi 19 Jul '16

19 Jul '16

Dear expert, I have some ALSA questions please: - Why codec driver of ASOC are always I2C based ?, is codec driver role is only control of audio hardware(set/reset registers only)? - There should be three drivers : machine driver, platform driver and codec driver , all of them have .probe and . remove , what is relation between all the probes? removes ? - As far I know McBSP is source of audio coming from host and I2C/ McBSP have no direct relation so why we connect platform driver (McBSP) with codec driver(I2C) Via DAI ? - When calling snd_pcm_open from userspace which kernel API is called ? snd_pcm_lib_ioctl or snd_stm_spdif_player_open ? if snd_stm_spdif_player_open so when called snd_pcm_lib_ioctl ? - How ALSA KERNELAPI is connected to ALSA SOC CORE, via which calls/mechanism ? Thanks q lot for your great help LINI

2 2

[alsa-devel] [PATCH] ALSA: usb-audio: Fix quirks code is not called
by Kazuki Oikawa 18 Jul '16

18 Jul '16

snd_usb_{set_interface,ctl_msg}_quirk checks chip->usb_id to need calling a quirks code. But existed code path that not calling dev_set_drvdata in usb_audio_probe. Signed-off-by: Kazuki Oikawa <k(a)oikw.org> Fixes: 79289e24194a ("ALSA: usb-audio: Refer to chip->usb_id for quirks and MIDI creation") --- sound/usb/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 3fc63583a537..2d493501b7f6 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -552,7 +552,6 @@ static int usb_audio_probe(struct usb_interface *intf, goto __error; } chip = usb_chip[i]; - dev_set_drvdata(&dev->dev, chip); atomic_inc(&chip->active); /* avoid autopm */ break; } @@ -578,6 +577,7 @@ static int usb_audio_probe(struct usb_interface *intf, goto __error; } } + dev_set_drvdata(&dev->dev, chip); /* * For devices with more than one control interface, we assume the -- 2.9.2

3 2

[alsa-devel] [PATCH v2] ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members
by Takashi Sakamoto 17 Jul '16

17 Jul '16

Currently, sound device drivers for PCI cards produced by Echo Audio support dimension parameter of element information. But the information has contradictions to the number of members of each element. I guess that this comes from the assumption that these sound cards are used only by 'echomixer' in userspace. But ideally, they should be used with usual ALSA control applications. This commit removes the contradiction. As a result, 'Monitor Mixer Volume' and 'VMixer Volume' elements are shown in usual ALSA control applications such as 'amixer' and 'alsamixer' in series. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/pci/echoaudio/echoaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 1cb85ae..3a8e8d5 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1272,11 +1272,11 @@ static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol, chip = snd_kcontrol_chip(kcontrol); uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = ECHOGAIN_MAXOUT; uinfo->dimen.d[0] = num_busses_out(chip); uinfo->dimen.d[1] = num_busses_in(chip); + uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1]; return 0; } @@ -1344,11 +1344,11 @@ static int snd_echo_vmixer_info(struct snd_kcontrol *kcontrol, chip = snd_kcontrol_chip(kcontrol); uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = ECHOGAIN_MAXOUT; uinfo->dimen.d[0] = num_busses_out(chip); uinfo->dimen.d[1] = num_pipes_out(chip); + uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1]; return 0; } @@ -1728,7 +1728,6 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 96; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = 0; #ifdef ECHOCARD_HAS_VMIXER @@ -1738,6 +1737,7 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, #endif uinfo->dimen.d[1] = 16; /* 16 channels */ uinfo->dimen.d[2] = 2; /* 0=level, 1=peak */ + uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1] * uinfo->dimen.d[2]; return 0; } -- 2.7.4

2 1

[alsa-devel] [alsa-lib][PATCH] ctl: rename APIs to add an element set so that their names are appropriate
by Takashi Sakamoto 17 Jul '16

17 Jul '16

In this development period, some APIs have already been added. Most of them are to add an element set, while their names are not so appropriate against their feature. This is due to following to names of old APIs. This commit renames them. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- include/control.h | 10 +++++----- src/control/control.c | 34 +++++++++++++++++----------------- src/pcm/pcm_softvol.c | 4 ++-- test/user-ctl-element-set.c | 10 +++++----- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/control.h b/include/control.h index cd60d90..1d4bfcb 100644 --- a/include/control.h +++ b/include/control.h @@ -425,24 +425,24 @@ void snd_ctl_elem_info_set_subdevice(snd_ctl_elem_info_t *obj, unsigned int val) void snd_ctl_elem_info_set_name(snd_ctl_elem_info_t *obj, const char *val); void snd_ctl_elem_info_set_index(snd_ctl_elem_info_t *obj, unsigned int val); -int snd_ctl_elem_add_integer_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_integer_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, long min, long max, long step); -int snd_ctl_elem_add_integer64_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_integer64_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, long long min, long long max, long long step); -int snd_ctl_elem_add_boolean_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_boolean_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count); -int snd_ctl_elem_add_enumerated_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_enumerated_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, unsigned int items, const char *const labels[]); -int snd_ctl_elem_add_bytes_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_bytes_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count); diff --git a/src/control/control.c b/src/control/control.c index a48ba9d..aa05130 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -371,7 +371,7 @@ static bool validate_element_member_dimension(snd_ctl_elem_info_t *info) * \par Compatibility: * This function is added in version 1.1.2. */ -int snd_ctl_elem_add_integer_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_integer_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, long min, long max, long step) @@ -460,7 +460,7 @@ int snd_ctl_elem_add_integer_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, * \par Compatibility: * This function is added in version 1.1.2. */ -int snd_ctl_elem_add_integer64_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_integer64_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, long long min, long long max, long long step) @@ -545,7 +545,7 @@ int snd_ctl_elem_add_integer64_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, * \par Compatibility: * This function is added in version 1.1.2. */ -int snd_ctl_elem_add_boolean_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_boolean_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count) { @@ -609,7 +609,7 @@ int snd_ctl_elem_add_boolean_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, * \par Compatibility: * This function is added in version 1.1.2. */ -int snd_ctl_elem_add_enumerated_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_enumerated_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count, unsigned int items, @@ -694,7 +694,7 @@ int snd_ctl_elem_add_enumerated_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, * \par Compatibility: * This function is added in version 1.1.2. */ -int snd_ctl_elem_add_bytes_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, +int snd_ctl_add_bytes_elem_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, unsigned int element_count, unsigned int member_count) { @@ -716,9 +716,9 @@ int snd_ctl_elem_add_bytes_set(snd_ctl_t *ctl, snd_ctl_elem_info_t *info, /** * \brief Create and add an user-defined control element of integer type. * - * This is a wrapper function to snd_ctl_elem_add_integer_set() for a control + * This is a wrapper function to snd_ctl_add_integer_elem_set() for a control * element. This doesn't fill the id data with full information, thus it's - * recommended to use snd_ctl_elem_add_integer_set(), instead. + * recommended to use snd_ctl_add_integer_elem_set(), instead. */ int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count, @@ -728,16 +728,16 @@ int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, info.id = *id; - return snd_ctl_elem_add_integer_set(ctl, &info, 1, member_count, + return snd_ctl_add_integer_elem_set(ctl, &info, 1, member_count, min, max, step); } /** * \brief Create and add an user-defined control element of integer64 type. * - * This is a wrapper function to snd_ctl_elem_add_integer64_set() for a single + * This is a wrapper function to snd_ctl_add_integer64_elem_set() for a single * control element. This doesn't fill the id data with full information, thus - * it's recommended to use snd_ctl_elem_add_integer64_set(), instead. + * it's recommended to use snd_ctl_add_integer64_elem_set(), instead. */ int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count, @@ -747,16 +747,16 @@ int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, info.id = *id; - return snd_ctl_elem_add_integer64_set(ctl, &info, 1, member_count, + return snd_ctl_add_integer64_elem_set(ctl, &info, 1, member_count, min, max, step); } /** * \brief Create and add an user-defined control element of boolean type. * - * This is a wrapper function to snd_ctl_elem_add_boolean_set() for a single + * This is a wrapper function to snd_ctl_add_boolean_elem_set() for a single * control element. This doesn't fill the id data with full information, thus - * it's recommended to use snd_ctl_elem_add_boolean_set(), instead. + * it's recommended to use snd_ctl_add_boolean_elem_set(), instead. */ int snd_ctl_elem_add_boolean(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count) @@ -765,15 +765,15 @@ int snd_ctl_elem_add_boolean(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, info.id = *id; - return snd_ctl_elem_add_boolean_set(ctl, &info, 1, member_count); + return snd_ctl_add_boolean_elem_set(ctl, &info, 1, member_count); } /** * \brief Create and add a user-defined control element of enumerated type. * - * This is a wrapper function to snd_ctl_elem_add_enumerated_set() for a single + * This is a wrapper function to snd_ctl_add_enumerated_elem_set() for a single * control element. This doesn't fill the id data with full information, thus - * it's recommended to use snd_ctl_elem_add_enumerated_set(), instead. + * it's recommended to use snd_ctl_add_enumerated_elem_set(), instead. * * This function is added in version 1.0.25. */ @@ -785,7 +785,7 @@ int snd_ctl_elem_add_enumerated(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, info.id = *id; - return snd_ctl_elem_add_enumerated_set(ctl, &info, 1, member_count, + return snd_ctl_add_enumerated_elem_set(ctl, &info, 1, member_count, items, labels); } diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c index 6135778..1fe5784 100644 --- a/src/pcm/pcm_softvol.c +++ b/src/pcm/pcm_softvol.c @@ -671,9 +671,9 @@ static int add_user_ctl(snd_pcm_softvol_t *svol, snd_ctl_elem_info_t *cinfo, unsigned int def_val; if (svol->max_val == 1) - err = snd_ctl_elem_add_boolean_set(svol->ctl, cinfo, 1, count); + err = snd_ctl_add_boolean_elem_set(svol->ctl, cinfo, 1, count); else - err = snd_ctl_elem_add_integer_set(svol->ctl, cinfo, 1, count, + err = snd_ctl_add_integer_elem_set(svol->ctl, cinfo, 1, count, 0, svol->max_val, 0); if (err < 0) return err; diff --git a/test/user-ctl-element-set.c b/test/user-ctl-element-set.c index 0481300..9b9dc59 100644 --- a/test/user-ctl-element-set.c +++ b/test/user-ctl-element-set.c @@ -31,7 +31,7 @@ struct elem_set_trial { static int add_bool_elem_set(struct elem_set_trial *trial, snd_ctl_elem_info_t *info) { - return snd_ctl_elem_add_boolean_set(trial->handle, info, + return snd_ctl_add_boolean_elem_set(trial->handle, info, trial->element_count, trial->member_count); } @@ -51,7 +51,7 @@ static void change_bool_elem_members(struct elem_set_trial *trial, static int add_int_elem_set(struct elem_set_trial *trial, snd_ctl_elem_info_t *info) { - return snd_ctl_elem_add_integer_set(trial->handle, info, + return snd_ctl_add_integer_elem_set(trial->handle, info, trial->element_count, trial->member_count, 0, 99, 1); } @@ -93,7 +93,7 @@ static const char *const labels[] = { static int add_enum_elem_set(struct elem_set_trial *trial, snd_ctl_elem_info_t *info) { - return snd_ctl_elem_add_enumerated_set(trial->handle, info, + return snd_ctl_add_enumerated_elem_set(trial->handle, info, trial->element_count, trial->member_count, sizeof(labels) / sizeof(labels[0]), labels); @@ -142,7 +142,7 @@ static void change_enum_elem_members(struct elem_set_trial *trial, static int add_bytes_elem_set(struct elem_set_trial *trial, snd_ctl_elem_info_t *info) { - return snd_ctl_elem_add_bytes_set(trial->handle, info, + return snd_ctl_add_bytes_elem_set(trial->handle, info, trial->element_count, trial->member_count); } @@ -195,7 +195,7 @@ static void change_iec958_elem_members(struct elem_set_trial *trial, static int add_int64_elem_set(struct elem_set_trial *trial, snd_ctl_elem_info_t *info) { - return snd_ctl_elem_add_integer64_set(trial->handle, info, + return snd_ctl_add_integer64_elem_set(trial->handle, info, trial->element_count, trial->member_count, 100, 10000, 30); } -- 2.7.4

2 1