Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5549d549 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] use PCM interface for IEC958 controls 



Digigram VX core,ENS1370/1+ driver,CA0106 driver,EMU10K1/EMU10K2 driver
RME HDSP driver,RME9652 driver
For consistency, use the PCM interface instead of MIXER for IEC958
default/mask/stream mixer controls.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 10e8d78a

sound/drivers/vx/vx_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -796,14 +796,14 @@ static int vx_iec958_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontro 


static snd_kcontrol_new_t vx_control_iec958_mask = {

	.access =	SNDRV_CTL_ELEM_ACCESS_READ,

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),

	.info =		vx_iec958_info,	/* shared */

	.get =		vx_iec958_mask_get,

};



static snd_kcontrol_new_t vx_control_iec958 = {

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

	.info =         vx_iec958_info,

	.get =          vx_iec958_get,

sound/pci/ca0106/ca0106_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int snd_ca0106_spdif_put(snd_kcontrol_t * kcontrol, 
static snd_kcontrol_new_t snd_ca0106_spdif_mask_control =

{

	.access =	SNDRV_CTL_ELEM_ACCESS_READ,

        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,

        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,

        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),

	.count =	4,

        .info =         snd_ca0106_spdif_info,
@@ -306,7 +306,7 @@ static snd_kcontrol_new_t snd_ca0106_spdif_mask_control = 


static snd_kcontrol_new_t snd_ca0106_spdif_control =

{

        .iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

        .iface =	SNDRV_CTL_ELEM_IFACE_PCM,

        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

	.count =	4,

        .info =         snd_ca0106_spdif_info,

sound/pci/emu10k1/emu10k1x.c

+2 −2
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int snd_emu10k1x_spdif_put(snd_kcontrol_t * kcontrol, 
static snd_kcontrol_new_t snd_emu10k1x_spdif_mask_control =

{

	.access =	SNDRV_CTL_ELEM_ACCESS_READ,

	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,

	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),

	.count =	3,

	.info =         snd_emu10k1x_spdif_info,
@@ -1192,7 +1192,7 @@ static snd_kcontrol_new_t snd_emu10k1x_spdif_mask_control = 


static snd_kcontrol_new_t snd_emu10k1x_spdif_control =

{

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

	.count =	3,

	.info =         snd_emu10k1x_spdif_info,

sound/pci/emu10k1/emumixer.c

+6 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int snd_emu10k1_spdif_put(snd_kcontrol_t * kcontrol, 
static snd_kcontrol_new_t snd_emu10k1_spdif_mask_control =

{

	.access =	SNDRV_CTL_ELEM_ACCESS_READ,

	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,

	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),

	.count =	4,

	.info =         snd_emu10k1_spdif_info,
@@ -190,7 +190,7 @@ static snd_kcontrol_new_t snd_emu10k1_spdif_mask_control = 


static snd_kcontrol_new_t snd_emu10k1_spdif_control =

{

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

	.count =	4,

	.info =         snd_emu10k1_spdif_info,
@@ -931,10 +931,14 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu, 
		/* sb live! and audigy */

		if ((kctl = snd_ctl_new1(&snd_emu10k1_spdif_mask_control, emu)) == NULL)

			return -ENOMEM;

		if (!emu->audigy)

			kctl->id.device = emu->pcm_efx->device;

		if ((err = snd_ctl_add(card, kctl)))

			return err;

		if ((kctl = snd_ctl_new1(&snd_emu10k1_spdif_control, emu)) == NULL)

			return -ENOMEM;

		if (!emu->audigy)

			kctl->id.device = emu->pcm_efx->device;

		if ((err = snd_ctl_add(card, kctl)))

			return err;

	}

sound/pci/ens1370.c

+3 −3
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ static int snd_es1371_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t 
static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = {

	ES1371_SPDIF(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH)),

	{

		.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

		.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

		.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

		.info =		snd_ens1373_spdif_info,

		.get =		snd_ens1373_spdif_default_get,
@@ -1454,13 +1454,13 @@ static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { 
	},

	{

		.access =	SNDRV_CTL_ELEM_ACCESS_READ,

		.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

		.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

		.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),

		.info =		snd_ens1373_spdif_info,

		.get =		snd_ens1373_spdif_mask_get

	},

	{

		.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

		.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

		.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),

		.info =		snd_ens1373_spdif_info,

		.get =		snd_ens1373_spdif_stream_get,