#include <pulsecore/core-scache.h>
#include <pulsecore/macro.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/namereg.h>
#include "cli-text.h"
char *pa_sink_list_to_string(pa_core *c) {
pa_strbuf *s;
- pa_sink *sink;
+ pa_sink *sink, *default_sink;
uint32_t idx = PA_IDXSET_INVALID;
pa_assert(c);
pa_strbuf_printf(s, "%u sink(s) available.\n", pa_idxset_size(c->sinks));
+ default_sink = pa_namereg_get_default_sink(c);
+
PA_IDXSET_FOREACH(sink, c->sinks, idx) {
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX],
cv[PA_CVOLUME_SNPRINT_MAX],
"\tchannel map: %s%s%s\n"
"\tused by: %u\n"
"\tlinked by: %u\n",
- sink == c->default_sink ? '*' : ' ',
+ sink == default_sink ? '*' : ' ',
sink->index,
sink->name,
sink->driver,
char *pa_source_list_to_string(pa_core *c) {
pa_strbuf *s;
- pa_source *source;
+ pa_source *source, *default_source;
uint32_t idx = PA_IDXSET_INVALID;
pa_assert(c);
pa_strbuf_printf(s, "%u source(s) available.\n", pa_idxset_size(c->sources));
+ default_source = pa_namereg_get_default_source(c);
+
PA_IDXSET_FOREACH(source, c->sources, idx) {
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX],
cv[PA_CVOLUME_SNPRINT_MAX],
"\tchannel map: %s%s%s\n"
"\tused by: %u\n"
"\tlinked by: %u\n",
- c->default_source == source ? '*' : ' ',
+ source == default_source ? '*' : ' ',
source->index,
source->name,
source->driver,