From d9bb450ee8898cb810027897a32afd3adcb05d9f Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Tue, 19 Dec 2017 22:39:05 -0800 Subject: 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 --- app/paclient.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'app/paclient.cpp') 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]); } } } -- cgit 1.2.3-korg