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

pod: cleanup event and command init

Browse source
This commit is contained in:
Wim Taymans 2019-08-22 12:47:27 +02:00
parent c9e177827b
commit 570575f052
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/include/spa/node/command.h
View file

@ -44,10 +44,8 @@ enum spa_node_command {
}; };
#define SPA_NODE_COMMAND_ID(cmd) SPA_COMMAND_ID(cmd, SPA_TYPE_COMMAND_Node) #define SPA_NODE_COMMAND_ID(cmd) SPA_COMMAND_ID(cmd, SPA_TYPE_COMMAND_Node)
#define SPA_NODE_COMMAND_INIT(id) SPA_COMMAND_INIT(SPA_TYPE_COMMAND_Node, id)
#define SPA_NODE_COMMAND_INIT(id) (struct spa_command) \
{ { sizeof(struct spa_command_body), SPA_TYPE_Object }, \
{ { SPA_TYPE_COMMAND_Node, id } } } \
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

5
spa/include/spa/node/event.h
View file

@ -41,10 +41,7 @@ enum spa_node_event {
}; };
#define SPA_NODE_EVENT_ID(ev) SPA_EVENT_ID(ev, SPA_TYPE_EVENT_Node) #define SPA_NODE_EVENT_ID(ev) SPA_EVENT_ID(ev, SPA_TYPE_EVENT_Node)
#define SPA_NODE_EVENT_INIT(id) SPA_EVENT_INIT(SPA_TYPE_EVENT_Node, id)
#define SPA_NODE_EVENT_INIT(id) (struct spa_event) \
{ { sizeof(struct spa_event_body), SPA_TYPE_Object }, \
{ { SPA_TYPE_EVENT_Node, id } } } \
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

11
spa/include/spa/pod/command.h
View file

@ -45,14 +45,15 @@ struct spa_command {
#define SPA_COMMAND_ID(cmd,type) (SPA_COMMAND_TYPE(cmd) == type ? \ #define SPA_COMMAND_ID(cmd,type) (SPA_COMMAND_TYPE(cmd) == type ? \
(cmd)->body.body.id : SPA_ID_INVALID) (cmd)->body.body.id : SPA_ID_INVALID)
#define SPA_COMMAND_INIT(type,id) (struct spa_command) \
{ { sizeof(struct spa_command_body), SPA_TYPE_Object }, \
{ { type, id } } } \
#define SPA_COMMAND_INIT_FULL(t,size,type,id,...) (t) \ #define SPA_COMMAND_INIT_FULL(t,size,type,id,...) (t) \
{ { size, SPA_TYPE_OBJECT }, \ { { size, SPA_TYPE_Object }, \
{ { type, id }, ##__VA_ARGS__ } } \ { { type, id }, ##__VA_ARGS__ } } \
#define SPA_COMMAND_INIT(type,id) \
SPA_COMMAND_INIT_FULL(struct spa_command, \
sizeof(struct spa_command_body), type, id)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif

8
spa/include/spa/pod/event.h
View file

@ -44,14 +44,14 @@ struct spa_event {
#define SPA_EVENT_ID(ev,type) (SPA_EVENT_TYPE(ev) == type ? \ #define SPA_EVENT_ID(ev,type) (SPA_EVENT_TYPE(ev) == type ? \
(ev)->body.body.id : SPA_ID_INVALID) (ev)->body.body.id : SPA_ID_INVALID)
#define SPA_EVENT_INIT(type,id) (struct spa_event) \
{ { sizeof(struct spa_event_body), SPA_TYPE_Object }, \
{ { type, id } } } \
#define SPA_EVENT_INIT_FULL(t,size,type,id,...) (t) \ #define SPA_EVENT_INIT_FULL(t,size,type,id,...) (t) \
{ { size, SPA_TYPE_OBJECT }, \ { { size, SPA_TYPE_OBJECT }, \
{ { type, id }, ##__VA_ARGS__ } } \ { { type, id }, ##__VA_ARGS__ } } \
#define SPA_EVENT_INIT(type,id) \
SPA_EVENT_INIT_FULL(struct spa_event, \
sizeof(struct spa_event_body), type, id)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif