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

Remove SpaQueue, use SpaList instead

Browse source
This commit is contained in:
Wim Taymans 2016-11-09 12:57:51 +01:00
parent 89bc235924
commit d0f95fc323
20 changed files with 153 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pinos/client/array.h
View file

@ -42,7 +42,7 @@ struct _PinosArray {
#define pinos_array_get_unchecked(a,idx,t) pinos_array_get_unchecked_s(a,idx,sizeof(t),t)
#define pinos_array_check_index(a,idx,t) pinos_array_check_index_s(a,idx,sizeof(t))
#define PINOS_ARRAY_FOREACH(pos, array) \
#define pinos_array_for_each(pos, array) \
for (pos = (array)->data; \
(const char *) pos < ((const char *) (array)->data + (array)->size); \
(pos)++)

83
pinos/client/list.h
View file

@ -1,83 +0,0 @@
/* Simple Plugin API
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __PINOS_LIST_H__
#define __PINOS_LIST_H__
#ifdef __cplusplus
extern "C" {
#endif
typedef struct _PinosList PinosList;
#include <spa/defs.h>
struct _PinosList {
PinosList *next;
PinosList *prev;
};
static inline void
pinos_list_init (PinosList *list)
{
list->next = list;
list->prev = list;
}
static inline void
pinos_list_insert (PinosList *list,
PinosList *elem)
{
elem->prev = list;
elem->next = list->next;
list->next = elem;
elem->next->prev = elem;
}
static inline void
pinos_list_remove (PinosList *elem)
{
elem->prev->next = elem->next;
elem->next->prev = elem->prev;
elem->next = NULL;
elem->prev = NULL;
}
#define PINOS_CONTAINER_OF(ptr, sample, member) \
(__typeof__(sample))((char *)(ptr) - \
offsetof(__typeof__(*sample), member))
#define PINOS_LIST_FOREACH(pos, head, member) \
for (pos = PINOS_CONTAINER_OF((head)->next, pos, member); \
&pos->member != (head); \
pos = PINOS_CONTAINER_OF(pos->member.next, pos, member))
#define PINOS_LIST_FOREACH_SAFE(pos, tmp, head, member) \
for (pos = PINOS_CONTAINER_OF((head)->next, pos, member), \
tmp = PINOS_CONTAINER_OF((pos)->member.next, tmp, member); \
&pos->member != (head); \
pos = tmp, \
tmp = PINOS_CONTAINER_OF(pos->member.next, tmp, member))
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* __PINOS_LIST_H__ */

12
pinos/client/signal.h
View file

@ -20,7 +20,7 @@
#ifndef __PINOS_SIGNAL_H__
#define __PINOS_SIGNAL_H__
#include <pinos/client/list.h>
#include <spa/include/spa/list.h>
#ifdef __cplusplus
extern "C" {
@ -30,26 +30,26 @@ typedef struct _PinosSignal PinosSignal;
typedef struct _PinosListener PinosListener;
struct _PinosListener {
PinosList link;
SpaList link;
void (*notify) (PinosListener *listener, void *data);
void *user_data;
};
struct _PinosSignal {
PinosList listeners;
SpaList listeners;
};
static inline void
pinos_signal_init (PinosSignal *signal)
{
pinos_list_init (&signal->listeners);
spa_list_init (&signal->listeners);
}
static inline void
pinos_signal_add (PinosSignal *signal,
PinosListener *listener)
{
pinos_list_insert (signal->listeners.prev, &listener->link);
spa_list_insert (signal->listeners.prev, &listener->link);
}
static inline void
@ -58,7 +58,7 @@ pinos_signal_emit (PinosSignal *signal,
{
PinosListener *l, *next;
PINOS_LIST_FOREACH_SAFE (l, next, &signal->listeners, link)
spa_list_for_each_safe (l, next, &signal->listeners, link)
l->notify (l, data);
}

8
pinos/client/stream.c
View file

@ -142,7 +142,7 @@ clear_buffers (PinosStream *stream)
PinosStreamPrivate *priv = stream->priv;
BufferId *bid;
PINOS_ARRAY_FOREACH (bid, &priv->buffer_ids) {
pinos_array_for_each (bid, &priv->buffer_ids) {
g_signal_emit (stream, signals[SIGNAL_REMOVE_BUFFER], 0, bid->id);
bid->buf = NULL;
}
@ -730,7 +730,7 @@ find_mem (PinosStream *stream, uint32_t id)
PinosStreamPrivate *priv = stream->priv;
MemId *mid;
PINOS_ARRAY_FOREACH (mid, &priv->mem_ids) {
pinos_array_for_each (mid, &priv->mem_ids) {
if (mid->id == id)
return mid;
}
@ -747,7 +747,7 @@ find_buffer (PinosStream *stream, uint32_t id)
} else {
BufferId *bid;
PINOS_ARRAY_FOREACH (bid, &priv->buffer_ids) {
pinos_array_for_each (bid, &priv->buffer_ids) {
if (bid->id == id)
return bid;
}
@ -1706,7 +1706,7 @@ pinos_stream_get_empty_buffer (PinosStream *stream)
priv = stream->priv;
g_return_val_if_fail (priv->direction == SPA_DIRECTION_OUTPUT, FALSE);
PINOS_ARRAY_FOREACH (bid, &priv->buffer_ids) {
pinos_array_for_each (bid, &priv->buffer_ids) {
if (!bid->used)
return bid->id;
}