mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
remove global memblock statistic variables in favor of memblock_stat objects
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@137 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
81822a7519
commit
e75b65715b
32 changed files with 158 additions and 80 deletions
|
|
@ -91,6 +91,8 @@ struct pa_pstream {
|
|||
|
||||
void (*drain_callback)(struct pa_pstream *p, void *userdata);
|
||||
void *drain_userdata;
|
||||
|
||||
struct pa_memblock_stat *memblock_stat;
|
||||
};
|
||||
|
||||
static void do_write(struct pa_pstream *p);
|
||||
|
|
@ -129,7 +131,7 @@ static void defer_callback(struct pa_mainloop_api *m, struct pa_defer_event *e,
|
|||
do_something(p);
|
||||
}
|
||||
|
||||
struct pa_pstream *pa_pstream_new(struct pa_mainloop_api *m, struct pa_iochannel *io) {
|
||||
struct pa_pstream *pa_pstream_new(struct pa_mainloop_api *m, struct pa_iochannel *io, struct pa_memblock_stat *s) {
|
||||
struct pa_pstream *p;
|
||||
assert(io);
|
||||
|
||||
|
|
@ -165,6 +167,8 @@ struct pa_pstream *pa_pstream_new(struct pa_mainloop_api *m, struct pa_iochannel
|
|||
p->drain_callback = NULL;
|
||||
p->drain_userdata = NULL;
|
||||
|
||||
p->memblock_stat = s;
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
|
|
@ -350,7 +354,7 @@ static void do_read(struct pa_pstream *p) {
|
|||
p->read.data = p->read.packet->data;
|
||||
} else {
|
||||
/* Frame is a memblock frame */
|
||||
p->read.memblock = pa_memblock_new(ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]));
|
||||
p->read.memblock = pa_memblock_new(ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]), p->memblock_stat);
|
||||
assert(p->read.memblock);
|
||||
p->read.data = p->read.memblock->data;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue