In times where the sink/source names are generated from HAL UDIs don't show the cryptic device name any more
git-svn-id: file:///home/lennart/svn/public/pavucontrol/trunk@43 c17c95f2-f111-0410-90bf-f30a9569010c
This commit is contained in:
parent
1af6b39a9a
commit
79d647f33e
|
@ -557,10 +557,9 @@ void MainWindow::updateSink(const pa_sink_info &info) {
|
||||||
w->type = info.flags & PA_SINK_HARDWARE ? SINK_HARDWARE : SINK_VIRTUAL;
|
w->type = info.flags & PA_SINK_HARDWARE ? SINK_HARDWARE : SINK_VIRTUAL;
|
||||||
w->name = info.name;
|
w->name = info.name;
|
||||||
|
|
||||||
|
w->boldNameLabel->set_text("");
|
||||||
gchar *txt;
|
gchar *txt;
|
||||||
w->boldNameLabel->set_markup(txt = g_markup_printf_escaped("<b>%s</b>", info.name));
|
w->nameLabel->set_markup(txt = g_markup_printf_escaped("%s", info.description));
|
||||||
g_free(txt);
|
|
||||||
w->nameLabel->set_markup(txt = g_markup_printf_escaped(": %s", info.description));
|
|
||||||
g_free(txt);
|
g_free(txt);
|
||||||
|
|
||||||
w->setVolume(info.volume);
|
w->setVolume(info.volume);
|
||||||
|
@ -586,10 +585,9 @@ void MainWindow::updateSource(const pa_source_info &info) {
|
||||||
|
|
||||||
w->type = info.monitor_of_sink != PA_INVALID_INDEX ? SOURCE_MONITOR : (info.flags & PA_SOURCE_HARDWARE ? SOURCE_HARDWARE : SOURCE_VIRTUAL);
|
w->type = info.monitor_of_sink != PA_INVALID_INDEX ? SOURCE_MONITOR : (info.flags & PA_SOURCE_HARDWARE ? SOURCE_HARDWARE : SOURCE_VIRTUAL);
|
||||||
|
|
||||||
|
w->boldNameLabel->set_text("");
|
||||||
gchar *txt;
|
gchar *txt;
|
||||||
w->boldNameLabel->set_markup(txt = g_markup_printf_escaped("<b>%s</b>", info.name));
|
w->nameLabel->set_markup(txt = g_markup_printf_escaped("%s", info.description));
|
||||||
g_free(txt);
|
|
||||||
w->nameLabel->set_markup(txt = g_markup_printf_escaped(": %s", info.description));
|
|
||||||
g_free(txt);
|
g_free(txt);
|
||||||
|
|
||||||
w->setVolume(info.volume);
|
w->setVolume(info.volume);
|
||||||
|
@ -623,7 +621,7 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
|
||||||
w->nameLabel->set_markup(txt = g_markup_printf_escaped(": %s", info.name));
|
w->nameLabel->set_markup(txt = g_markup_printf_escaped(": %s", info.name));
|
||||||
g_free(txt);
|
g_free(txt);
|
||||||
} else {
|
} else {
|
||||||
w->boldNameLabel->set_label("");
|
w->boldNameLabel->set_text("");
|
||||||
w->nameLabel->set_label(info.name);
|
w->nameLabel->set_label(info.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue