Page MenuHomeFreeBSD
Files F98148995

D46309.id142119.diff
No OneTemporary
Actions

D46309.id142119.diff
View Options

diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -388,6 +388,7 @@
uint32_t maxrate, minrate, fmts, minchn, maxchn, caps;
nvlist_t *di = NULL, *sound4di = NULL, *diinfo = NULL, *cdi = NULL;
int err, nchan;
+ char buf[AFMTSTR_LEN];
di = nvlist_create(0);
if (di == NULL) {
@@ -531,10 +532,12 @@
while (f != NULL) {
sbuf_printf(&sb, "%s", f->class->name);
if (f->desc->type == FEEDER_FORMAT) {
- sbuf_printf(&sb, "(0x%08x -> 0x%08x)",
- f->desc->in, f->desc->out);
+ snd_afmt2str(f->desc->in, buf, sizeof(buf));
+ sbuf_printf(&sb, "(%s -> ", buf);
+ snd_afmt2str(f->desc->out, buf, sizeof(buf));
+ sbuf_printf(&sb, "%s)", buf);
} else if (f->desc->type == FEEDER_MATRIX) {
- sbuf_printf(&sb, "(%d.%d -> %d.%d)",
+ sbuf_printf(&sb, "(%d.%dch -> %d.%dch)",
AFMT_CHANNEL(f->desc->in) -
AFMT_EXTCHANNEL(f->desc->in),
AFMT_EXTCHANNEL(f->desc->in),
@@ -542,16 +545,11 @@
AFMT_EXTCHANNEL(f->desc->out),
AFMT_EXTCHANNEL(f->desc->out));
} else if (f->desc->type == FEEDER_RATE) {
- sbuf_printf(&sb,
- "(0x%08x q:%d %d -> %d)",
- f->desc->out,
- FEEDER_GET(f, FEEDRATE_QUALITY),
+ sbuf_printf(&sb, "(%d -> %d)",
FEEDER_GET(f, FEEDRATE_SRC),
FEEDER_GET(f, FEEDRATE_DST));
- } else {
- sbuf_printf(&sb, "(0x%08x)",
- f->desc->out);
- }
+ } else
+ sbuf_printf(&sb, "(0x%08x)", f->desc->out);
sbuf_printf(&sb, " -> ");
f = f->parent;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 3, 12:21 PM (13 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
11049241
Default Alt Text
D46309.id142119.diff (1 KB)

Event Timeline