Page MenuHomeFreeBSD
Files F146512218

D53557.id165741.diff
No OneTemporary
Actions

D53557.id165741.diff
View Options

diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -28,7 +28,6 @@
*/
struct pcm_feederdesc {
- u_int32_t type;
u_int32_t in, out;
};
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -101,7 +101,7 @@
if (desc) {
*(f->desc) = *desc;
} else {
- f->desc->type = FEEDER_ROOT;
+ f->class->type = FEEDER_ROOT;
f->desc->in = 0;
f->desc->out = 0;
}
@@ -166,7 +166,7 @@
f = c->feeder;
while (f != NULL) {
- if (f->desc->type == type)
+ if (f->class->type == type)
return f;
f = f->source;
}
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -144,7 +144,6 @@
int ret;
desc = &(cdesc->desc);
- desc->type = FEEDER_FORMAT;
desc->in = 0;
desc->out = 0;
@@ -216,7 +215,6 @@
return (ret);
desc = &(cdesc->desc);
- desc->type = FEEDER_RATE;
desc->in = 0;
desc->out = 0;
@@ -293,7 +291,6 @@
return (ret);
desc = &(cdesc->desc);
- desc->type = FEEDER_MATRIX;
desc->in = 0;
desc->out = 0;
@@ -349,7 +346,6 @@
return (ret);
desc = &(cdesc->desc);
- desc->type = FEEDER_VOLUME;
desc->in = 0;
desc->out = 0;
@@ -416,7 +412,6 @@
return (ret);
desc = &(cdesc->desc);
- desc->type = FEEDER_EQ;
desc->in = 0;
desc->out = 0;
@@ -495,7 +490,6 @@
int ret;
desc = &(cdesc->desc);
- desc->type = FEEDER_MIXER;
desc->in = 0;
desc->out = 0;
diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c
--- a/sys/dev/sound/pcm/feeder_matrix.c
+++ b/sys/dev/sound/pcm/feeder_matrix.c
@@ -413,7 +413,7 @@
struct pcmchan_matrix *m_out)
{
- if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_MATRIX ||
+ if (f == NULL || f->desc == NULL || f->class->type != FEEDER_MATRIX ||
f->data == NULL)
return (EINVAL);
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -332,7 +332,7 @@
struct feed_volume_info *info;
uint32_t i;
- if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_VOLUME ||
+ if (f == NULL || f->desc == NULL || f->class->type != FEEDER_VOLUME ||
f->data == NULL || m == NULL || m->channels < SND_CHN_MIN ||
m->channels > SND_CHN_MAX)
return (EINVAL);
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
@@ -533,12 +533,12 @@
f = f->source;
while (f != NULL) {
sbuf_printf(&sb, "%s", f->class->name);
- if (f->desc->type == FEEDER_FORMAT) {
+ if (f->class->type == FEEDER_FORMAT) {
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) {
+ } else if (f->class->type == FEEDER_MATRIX) {
sbuf_printf(&sb, "(%d.%dch -> %d.%dch)",
AFMT_CHANNEL(f->desc->in) -
AFMT_EXTCHANNEL(f->desc->in),
@@ -546,7 +546,7 @@
AFMT_CHANNEL(f->desc->out) -
AFMT_EXTCHANNEL(f->desc->out),
AFMT_EXTCHANNEL(f->desc->out));
- } else if (f->desc->type == FEEDER_RATE) {
+ } else if (f->class->type == FEEDER_RATE) {
sbuf_printf(&sb, "(%d -> %d)",
FEEDER_GET(f, FEEDRATE_SRC),
FEEDER_GET(f, FEEDRATE_DST));
@@ -1328,10 +1328,10 @@
f = f->source;
while (f != NULL) {
sbuf_printf(s, "%s", f->class->name);
- if (f->desc->type == FEEDER_FORMAT) {
+ if (f->class->type == FEEDER_FORMAT) {
sbuf_printf(s, "(0x%08x -> 0x%08x)",
f->desc->in, f->desc->out);
- } else if (f->desc->type == FEEDER_MATRIX) {
+ } else if (f->class->type == FEEDER_MATRIX) {
sbuf_printf(s, "(%d.%d -> %d.%d)",
AFMT_CHANNEL(f->desc->in) -
AFMT_EXTCHANNEL(f->desc->in),
@@ -1339,7 +1339,7 @@
AFMT_CHANNEL(f->desc->out) -
AFMT_EXTCHANNEL(f->desc->out),
AFMT_EXTCHANNEL(f->desc->out));
- } else if (f->desc->type == FEEDER_RATE) {
+ } else if (f->class->type == FEEDER_RATE) {
sbuf_printf(s,
"(0x%08x q:%d %d -> %d)",
f->desc->out,

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 4, 6:48 AM (4 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29232099
Default Alt Text
D53557.id165741.diff (4 KB)

Event Timeline