summaryrefslogtreecommitdiffstats
path: root/app/paclient.cpp
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2017-12-19 22:39:05 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2017-12-21 05:52:44 +0000
commitd9bb450ee8898cb810027897a32afd3adcb05d9f (patch)
tree39e43ebed5f11c7f0fe9b8182540e24fbbe41d28 /app/paclient.cpp
parent3336a398bb8ae52b74affc00dcd03342592c5fd6 (diff)
mixer: add clearer pulseaudio control naming
Use the role name for the control name in the Mixer UI instead of overall vague control description Bug-AGL: SPEC-1196 Change-Id: I34b5c3378fa3bca7464067490907f9ae0adb6364 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'app/paclient.cpp')
-rw-r--r--app/paclient.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/paclient.cpp b/app/paclient.cpp
index afe0fad..bd53cde 100644
--- a/app/paclient.cpp
+++ b/app/paclient.cpp
@@ -104,8 +104,12 @@ void get_source_list_cb(pa_context *c,
if (!eol) {
self->addOneControlState(C_SOURCE, i->index, &i->volume);
for (chan = 0; chan < i->channel_map.channels; chan++) {
- emit self->controlAdded(i->index, QString(i->description), C_SOURCE, chan,
- channel_position_string[i->channel_map.map[chan]],
+ // NOTE: hide input control
+ if (QString(i->name).endsWith("monitor"))
+ continue;
+
+ emit self->controlAdded(i->index, QString(i->name), QString(i->description),
+ C_SOURCE, chan, channel_position_string[i->channel_map.map[chan]],
i->volume.values[chan]);
}
}
@@ -129,9 +133,9 @@ void get_sink_list_cb(pa_context *c,
if(!eol) {
self->addOneControlState(C_SINK, i->index, &i->volume);
for (chan = 0; chan < i->channel_map.channels; chan++) {
- emit self->controlAdded(i->index, QString(i->description), C_SINK, chan,
- channel_position_string[i->channel_map.map[chan]],
- i->volume.values[chan]);
+ emit self->controlAdded(i->index, QString(i->name), QString(i->description),
+ C_SINK, chan, channel_position_string[i->channel_map.map[chan]],
+ i->volume.values[chan]);
}
}
}