summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-04-11 16:36:38 +0000
committerLennart Poettering <lennart@poettering.net>2008-04-11 16:36:38 +0000
commit413656bce6ed85e4732412ddf89e93fc7a46683a (patch)
treedf787f855b16b1ab75ba47242c7424b375145a25
parent28ab2a0c1dc9e4cf86d8b583748796754b607096 (diff)
update list-xxx commands a bit
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2250 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/cli-text.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index 5bf27eec..140334a1 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -57,12 +57,12 @@ char *pa_module_list_to_string(pa_core *c) {
for (m = pa_idxset_first(c->modules, &idx); m; m = pa_idxset_next(c->modules, &idx)) {
pa_strbuf_printf(s, " index: %u\n"
- "\tname: <%s>\n"
- "\targument: <%s>\n"
- "\tused: %i\n"
- "\tauto unload: %s\n",
- m->index, m->name, m->argument ? m->argument : "", m->n_used,
- m->auto_unload ? "yes" : "no");
+ "\tname: <%s>\n"
+ "\targument: <%s>\n"
+ "\tused: %i\n"
+ "\tauto unload: %s\n",
+ m->index, m->name, m->argument ? m->argument : "", m->n_used,
+ pa_yes_no(m->auto_unload));
}
return pa_strbuf_tostring_free(s);
@@ -138,12 +138,12 @@ char *pa_sink_list_to_string(pa_core *c) {
sink->index,
sink->name,
sink->driver,
+ sink->flags & PA_SINK_HARDWARE ? "HARDWARE " : "",
+ sink->flags & PA_SINK_NETWORK ? "NETWORK " : "",
sink->flags & PA_SINK_HW_MUTE_CTRL ? "HW_MUTE_CTRL " : "",
sink->flags & PA_SINK_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "",
sink->flags & PA_SINK_DECIBEL_VOLUME ? "DECIBEL_VOLUME " : "",
sink->flags & PA_SINK_LATENCY ? "LATENCY " : "",
- sink->flags & PA_SINK_HARDWARE ? "HARDWARE " : "",
- sink->flags & PA_SINK_NETWORK ? "NETWORK " : "",
state_table[pa_sink_get_state(sink)],
pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink)),
!!pa_sink_get_mute(sink),
@@ -205,12 +205,12 @@ char *pa_source_list_to_string(pa_core *c) {
source->index,
source->name,
source->driver,
+ source->flags & PA_SOURCE_HARDWARE ? "HARDWARE " : "",
+ source->flags & PA_SOURCE_NETWORK ? "NETWORK " : "",
source->flags & PA_SOURCE_HW_MUTE_CTRL ? "HW_MUTE_CTRL " : "",
source->flags & PA_SOURCE_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "",
source->flags & PA_SOURCE_DECIBEL_VOLUME ? "DECIBEL_VOLUME " : "",
source->flags & PA_SOURCE_LATENCY ? "LATENCY " : "",
- source->flags & PA_SOURCE_HARDWARE ? "HARDWARE " : "",
- source->flags & PA_SOURCE_NETWORK ? "NETWORK " : "",
state_table[pa_source_get_state(source)],
pa_cvolume_snprint(cv, sizeof(cv), pa_source_get_volume(source)),
!!pa_source_get_mute(source),