mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass the client object around

Browse source 
Pass the client object around, it's easier to deal with than the sender
id.
Fix the ASYNC return check
Don't overwrite the fds of a pollitem, instead keep an index of their
position in the global fd array.
This commit is contained in:
Wim Taymans 2016-09-27 16:59:45 +02:00
parent 7b53fa8685
commit c6861845a7
14 changed files with 123 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pinos/server/rt-loop.c
View file

@ -35,9 +35,10 @@ struct _PinosRTLoopPrivate
{
unsigned int n_poll;
SpaPollItem poll[16];
int idx[16];
bool rebuild_fds;
SpaPollFd fds[16];
SpaPollFd fds[32];
unsigned int n_fds;
gboolean running;
@ -81,8 +82,8 @@ loop (void *user_data)
n_idle++;
}
}
if (n_idle > 0)
continue;
// if (n_idle > 0)
// continue;
/* rebuild */
if (priv->rebuild_fds) {
@ -96,7 +97,7 @@ loop (void *user_data)
for (j = 0; j < p->n_fds; j++)
priv->fds[priv->n_fds + j] = p->fds[j];
p->fds = &priv->fds[priv->n_fds];
priv->idx[i] = priv->n_fds;
priv->n_fds += p->n_fds;
}
priv->rebuild_fds = false;
@ -107,7 +108,7 @@ loop (void *user_data)
SpaPollItem *p = &priv->poll[i];
if (p->enabled && p->before_cb) {
ndata.fds = p->fds;
ndata.fds = &priv->fds[priv->idx[i]];
ndata.n_fds = p->n_fds;
ndata.user_data = p->user_data;
p->before_cb (&ndata);
@ -138,7 +139,7 @@ loop (void *user_data)
SpaPollItem *p = &priv->poll[i];
if (p->enabled && p->after_cb) {
ndata.fds = p->fds;
ndata.fds = &priv->fds[priv->idx[i]];
ndata.n_fds = p->n_fds;
ndata.user_data = p->user_data;
p->after_cb (&ndata);