Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Marijn Suijten
pulseaudio
Commits
ddd0fdb9
Commit
ddd0fdb9
authored
Dec 06, 2019
by
Jaroslav Kysela
Committed by
Arun Raghavan
Dec 18, 2019
Browse files
alsa-ucm: add control and mixer device items
Signed-off-by:
Jaroslav Kysela
<
perex@perex.cz
>
parent
d8200ee8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/modules/alsa/alsa-ucm.c
View file @
ddd0fdb9
...
...
@@ -90,16 +90,20 @@ static void ucm_port_update_available(pa_alsa_ucm_port_data *port);
static
struct
ucm_items
item
[]
=
{
{
"PlaybackPCM"
,
PA_ALSA_PROP_UCM_SINK
},
{
"CapturePCM"
,
PA_ALSA_PROP_UCM_SOURCE
},
{
"PlaybackCTL"
,
PA_ALSA_PROP_UCM_PLAYBACK_CTL_DEVICE
},
{
"PlaybackVolume"
,
PA_ALSA_PROP_UCM_PLAYBACK_VOLUME
},
{
"PlaybackSwitch"
,
PA_ALSA_PROP_UCM_PLAYBACK_SWITCH
},
{
"PlaybackMixer"
,
PA_ALSA_PROP_UCM_PLAYBACK_MIXER_DEVICE
},
{
"PlaybackMixerElem"
,
PA_ALSA_PROP_UCM_PLAYBACK_MIXER_ELEM
},
{
"PlaybackMasterElem"
,
PA_ALSA_PROP_UCM_PLAYBACK_MASTER_ELEM
},
{
"PlaybackMasterType"
,
PA_ALSA_PROP_UCM_PLAYBACK_MASTER_TYPE
},
{
"PlaybackPriority"
,
PA_ALSA_PROP_UCM_PLAYBACK_PRIORITY
},
{
"PlaybackRate"
,
PA_ALSA_PROP_UCM_PLAYBACK_RATE
},
{
"PlaybackChannels"
,
PA_ALSA_PROP_UCM_PLAYBACK_CHANNELS
},
{
"CaptureCTL"
,
PA_ALSA_PROP_UCM_CAPTURE_CTL_DEVICE
},
{
"CaptureVolume"
,
PA_ALSA_PROP_UCM_CAPTURE_VOLUME
},
{
"CaptureSwitch"
,
PA_ALSA_PROP_UCM_CAPTURE_SWITCH
},
{
"CaptureMixer"
,
PA_ALSA_PROP_UCM_CAPTURE_MIXER_DEVICE
},
{
"CaptureMixerElem"
,
PA_ALSA_PROP_UCM_CAPTURE_MIXER_ELEM
},
{
"CaptureMasterElem"
,
PA_ALSA_PROP_UCM_CAPTURE_MASTER_ELEM
},
{
"CaptureMasterType"
,
PA_ALSA_PROP_UCM_CAPTURE_MASTER_TYPE
},
...
...
@@ -107,6 +111,7 @@ static struct ucm_items item[] = {
{
"CaptureRate"
,
PA_ALSA_PROP_UCM_CAPTURE_RATE
},
{
"CaptureChannels"
,
PA_ALSA_PROP_UCM_CAPTURE_CHANNELS
},
{
"TQ"
,
PA_ALSA_PROP_UCM_QOS
},
{
"JackCTL"
,
PA_ALSA_PROP_UCM_JACK_DEVICE
},
{
"JackControl"
,
PA_ALSA_PROP_UCM_JACK_CONTROL
},
{
"JackHWMute"
,
PA_ALSA_PROP_UCM_JACK_HW_MUTE
},
{
NULL
,
NULL
},
...
...
src/modules/alsa/alsa-ucm.h
View file @
ddd0fdb9
...
...
@@ -45,12 +45,18 @@ typedef void snd_use_case_mgr_t;
/** For devices: Playback roles */
#define PA_ALSA_PROP_UCM_PLAYBACK_ROLES "alsa.ucm.playback.roles"
/** For devices: Playback control device name */
#define PA_ALSA_PROP_UCM_PLAYBACK_CTL_DEVICE "alsa.ucm.playback.ctldev"
/** For devices: Playback control volume ID string. e.g PlaybackVolume */
#define PA_ALSA_PROP_UCM_PLAYBACK_VOLUME "alsa.ucm.playback.volume"
/** For devices: Playback switch e.g PlaybackSwitch */
#define PA_ALSA_PROP_UCM_PLAYBACK_SWITCH "alsa.ucm.playback.switch"
/** For devices: Playback mixer device name */
#define PA_ALSA_PROP_UCM_PLAYBACK_MIXER_DEVICE "alsa.ucm.playback.mixer.device"
/** For devices: Playback mixer identifier */
#define PA_ALSA_PROP_UCM_PLAYBACK_MIXER_ELEM "alsa.ucm.playback.mixer.element"
...
...
@@ -78,12 +84,18 @@ typedef void snd_use_case_mgr_t;
/** For devices: Capture roles */
#define PA_ALSA_PROP_UCM_CAPTURE_ROLES "alsa.ucm.capture.roles"
/** For devices: Capture control device name */
#define PA_ALSA_PROP_UCM_CAPTURE_CTL_DEVICE "alsa.ucm.capture.ctldev"
/** For devices: Capture controls volume ID string. e.g CaptureVolume */
#define PA_ALSA_PROP_UCM_CAPTURE_VOLUME "alsa.ucm.capture.volume"
/** For devices: Capture switch e.g CaptureSwitch */
#define PA_ALSA_PROP_UCM_CAPTURE_SWITCH "alsa.ucm.capture.switch"
/** For devices: Capture mixer device name */
#define PA_ALSA_PROP_UCM_CAPTURE_MIXER_DEVICE "alsa.ucm.capture.mixer.device"
/** For devices: Capture mixer identifier */
#define PA_ALSA_PROP_UCM_CAPTURE_MIXER_ELEM "alsa.ucm.capture.mixer.element"
...
...
@@ -114,6 +126,9 @@ typedef void snd_use_case_mgr_t;
/** For devices: The modifier (if any) that this device corresponds to */
#define PA_ALSA_PROP_UCM_MODIFIER "alsa.ucm.modifier"
/* Corresponds to the "JackCTL" UCM value. */
#define PA_ALSA_PROP_UCM_JACK_DEVICE "alsa.ucm.jack_device"
/* Corresponds to the "JackControl" UCM value. */
#define PA_ALSA_PROP_UCM_JACK_CONTROL "alsa.ucm.jack_control"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment