diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-08-03 07:50:30 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 02:43:39 -0400 |
commit | 5549d54992391d81a8cbfbaac45a958876fbc9cb (patch) | |
tree | 167448ed62cbf5c60b4237df23945a34b5e38abe /sound/pci/rme9652 | |
parent | 10e8d78a94fc57f1bf11d50b97ff85b005e46d0b (diff) |
[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: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/rme9652')
-rw-r--r-- | sound/pci/rme9652/hdsp.c | 8 | ||||
-rw-r--r-- | sound/pci/rme9652/rme9652.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 60eef845a074..6694866089b5 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -3104,7 +3104,7 @@ HDSP_XLR_BREAKOUT_CABLE("XLR Breakout Cable", 0) | |||
3104 | 3104 | ||
3105 | static snd_kcontrol_new_t snd_hdsp_controls[] = { | 3105 | static snd_kcontrol_new_t snd_hdsp_controls[] = { |
3106 | { | 3106 | { |
3107 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 3107 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
3108 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 3108 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), |
3109 | .info = snd_hdsp_control_spdif_info, | 3109 | .info = snd_hdsp_control_spdif_info, |
3110 | .get = snd_hdsp_control_spdif_get, | 3110 | .get = snd_hdsp_control_spdif_get, |
@@ -3112,7 +3112,7 @@ static snd_kcontrol_new_t snd_hdsp_controls[] = { | |||
3112 | }, | 3112 | }, |
3113 | { | 3113 | { |
3114 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, | 3114 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, |
3115 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 3115 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
3116 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), | 3116 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), |
3117 | .info = snd_hdsp_control_spdif_stream_info, | 3117 | .info = snd_hdsp_control_spdif_stream_info, |
3118 | .get = snd_hdsp_control_spdif_stream_get, | 3118 | .get = snd_hdsp_control_spdif_stream_get, |
@@ -3120,7 +3120,7 @@ static snd_kcontrol_new_t snd_hdsp_controls[] = { | |||
3120 | }, | 3120 | }, |
3121 | { | 3121 | { |
3122 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 3122 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
3123 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 3123 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
3124 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), | 3124 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), |
3125 | .info = snd_hdsp_control_spdif_mask_info, | 3125 | .info = snd_hdsp_control_spdif_mask_info, |
3126 | .get = snd_hdsp_control_spdif_mask_get, | 3126 | .get = snd_hdsp_control_spdif_mask_get, |
@@ -3130,7 +3130,7 @@ static snd_kcontrol_new_t snd_hdsp_controls[] = { | |||
3130 | }, | 3130 | }, |
3131 | { | 3131 | { |
3132 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 3132 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
3133 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 3133 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
3134 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), | 3134 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), |
3135 | .info = snd_hdsp_control_spdif_mask_info, | 3135 | .info = snd_hdsp_control_spdif_mask_info, |
3136 | .get = snd_hdsp_control_spdif_mask_get, | 3136 | .get = snd_hdsp_control_spdif_mask_get, |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 6e3a91dba3eb..8ee4d6fd6ea7 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -1529,7 +1529,7 @@ static int snd_rme9652_get_tc_value(void *private_data, | |||
1529 | 1529 | ||
1530 | static snd_kcontrol_new_t snd_rme9652_controls[] = { | 1530 | static snd_kcontrol_new_t snd_rme9652_controls[] = { |
1531 | { | 1531 | { |
1532 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1532 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
1533 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 1533 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), |
1534 | .info = snd_rme9652_control_spdif_info, | 1534 | .info = snd_rme9652_control_spdif_info, |
1535 | .get = snd_rme9652_control_spdif_get, | 1535 | .get = snd_rme9652_control_spdif_get, |
@@ -1537,7 +1537,7 @@ static snd_kcontrol_new_t snd_rme9652_controls[] = { | |||
1537 | }, | 1537 | }, |
1538 | { | 1538 | { |
1539 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, | 1539 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, |
1540 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1540 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
1541 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), | 1541 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), |
1542 | .info = snd_rme9652_control_spdif_stream_info, | 1542 | .info = snd_rme9652_control_spdif_stream_info, |
1543 | .get = snd_rme9652_control_spdif_stream_get, | 1543 | .get = snd_rme9652_control_spdif_stream_get, |
@@ -1545,7 +1545,7 @@ static snd_kcontrol_new_t snd_rme9652_controls[] = { | |||
1545 | }, | 1545 | }, |
1546 | { | 1546 | { |
1547 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 1547 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
1548 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1548 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
1549 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), | 1549 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), |
1550 | .info = snd_rme9652_control_spdif_mask_info, | 1550 | .info = snd_rme9652_control_spdif_mask_info, |
1551 | .get = snd_rme9652_control_spdif_mask_get, | 1551 | .get = snd_rme9652_control_spdif_mask_get, |
@@ -1555,7 +1555,7 @@ static snd_kcontrol_new_t snd_rme9652_controls[] = { | |||
1555 | }, | 1555 | }, |
1556 | { | 1556 | { |
1557 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 1557 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
1558 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1558 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
1559 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), | 1559 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), |
1560 | .info = snd_rme9652_control_spdif_mask_info, | 1560 | .info = snd_rme9652_control_spdif_mask_info, |
1561 | .get = snd_rme9652_control_spdif_mask_get, | 1561 | .get = snd_rme9652_control_spdif_mask_get, |