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

Don't use __ in defines or declarations, it's reserved

Browse source 
SPA_TYPE -> SPA_TYPE_INFO for type info strings
improve includes

Fixes #115
This commit is contained in:
Wim Taymans 2019-01-14 12:58:23 +01:00
parent 6856f02cab
commit 3dc6820e9e
146 changed files with 890 additions and 951 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_COMMAND_NODE_H__
#define __SPA_COMMAND_NODE_H__
#ifndef SPA_COMMAND_NODE_H
#define SPA_COMMAND_NODE_H
#ifdef __cplusplus
extern "C" {
@ -53,4 +53,4 @@ enum spa_node_command {
} /* extern "C" */
#endif
#endif /* _SPA_COMMAND_NODE_H__ */
#endif /* SPA_COMMAND_NODE_H */

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

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_EVENT_NODE_H__
#define __SPA_EVENT_NODE_H__
#ifndef SPA_EVENT_NODE_H
#define SPA_EVENT_NODE_H
#ifdef __cplusplus
extern "C" {
@ -51,4 +51,4 @@ enum spa_node_event {
} /* extern "C" */
#endif
#endif /* __SPA_EVENT_NODE_H__ */
#endif /* SPA_EVENT_NODE_H */

6
spa/include/spa/node/io.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_IO_H__
#define __SPA_IO_H__
#ifndef SPA_IO_H
#define SPA_IO_H
#ifdef __cplusplus
extern "C" {
@ -143,4 +143,4 @@ struct spa_io_position {
} /* extern "C" */
#endif
#endif /* __SPA_IO_H__ */
#endif /* SPA_IO_H */

6
spa/include/spa/node/node.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_NODE_H__
#define __SPA_NODE_H__
#ifndef SPA_NODE_H
#define SPA_NODE_H
#ifdef __cplusplus
extern "C" {
@ -528,4 +528,4 @@ struct spa_node {
} /* extern "C" */
#endif
#endif /* __SPA_NODE_H__ */
#endif /* SPA_NODE_H */

62
spa/include/spa/node/type-info.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_NODE_TYPES_H__
#define __SPA_NODE_TYPES_H__
#ifndef SPA_NODE_TYPES_H
#define SPA_NODE_TYPES_H
#ifdef __cplusplus
extern "C" {
@ -35,54 +35,54 @@ extern "C" {
#include <spa/node/event.h>
#include <spa/node/io.h>
#define SPA_TYPE__IO SPA_TYPE_ENUM_BASE "IO"
#define SPA_TYPE_IO_BASE SPA_TYPE__IO ":"
#define SPA_TYPE_INFO_IO SPA_TYPE_INFO_ENUM_BASE "IO"
#define SPA_TYPE_INFO_IO_BASE SPA_TYPE_INFO_IO ":"
static const struct spa_type_info spa_type_io[] = {
{ SPA_IO_Invalid, SPA_TYPE_IO_BASE "Invalid", SPA_TYPE_Int, NULL },
{ SPA_IO_Buffers, SPA_TYPE_IO_BASE "Buffers", SPA_TYPE_Int, NULL },
{ SPA_IO_Range, SPA_TYPE_IO_BASE "Range", SPA_TYPE_Int, NULL },
{ SPA_IO_Clock, SPA_TYPE_IO_BASE "Clock", SPA_TYPE_Int, NULL },
{ SPA_IO_Latency, SPA_TYPE_IO_BASE "Latency", SPA_TYPE_Int, NULL },
{ SPA_IO_Control, SPA_TYPE_IO_BASE "Control", SPA_TYPE_Int, NULL },
{ SPA_IO_Notify, SPA_TYPE_IO_BASE "Notify", SPA_TYPE_Int, NULL },
{ SPA_IO_Position, SPA_TYPE_IO_BASE "Position", SPA_TYPE_Int, NULL },
{ SPA_IO_Invalid, SPA_TYPE_INFO_IO_BASE "Invalid", SPA_TYPE_Int, NULL },
{ SPA_IO_Buffers, SPA_TYPE_INFO_IO_BASE "Buffers", SPA_TYPE_Int, NULL },
{ SPA_IO_Range, SPA_TYPE_INFO_IO_BASE "Range", SPA_TYPE_Int, NULL },
{ SPA_IO_Clock, SPA_TYPE_INFO_IO_BASE "Clock", SPA_TYPE_Int, NULL },
{ SPA_IO_Latency, SPA_TYPE_INFO_IO_BASE "Latency", SPA_TYPE_Int, NULL },
{ SPA_IO_Control, SPA_TYPE_INFO_IO_BASE "Control", SPA_TYPE_Int, NULL },
{ SPA_IO_Notify, SPA_TYPE_INFO_IO_BASE "Notify", SPA_TYPE_Int, NULL },
{ SPA_IO_Position, SPA_TYPE_INFO_IO_BASE "Position", SPA_TYPE_Int, NULL },
{ 0, NULL, 0, NULL },
};
#define SPA_TYPE__NodeEvent SPA_TYPE_EVENT_BASE "Node"
#define SPA_TYPE_NODE_EVENT_BASE SPA_TYPE__NodeEvent ":"
#define SPA_TYPE_INFO_NodeEvent SPA_TYPE_INFO_EVENT_BASE "Node"
#define SPA_TYPE_INFO_NODE_EVENT_BASE SPA_TYPE_INFO_NodeEvent ":"
static const struct spa_type_info spa_type_node_event_id[] = {
{ SPA_NODE_EVENT_Error, SPA_TYPE_NODE_EVENT_BASE "Error", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_Buffering, SPA_TYPE_NODE_EVENT_BASE "Buffering", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_RequestRefresh, SPA_TYPE_NODE_EVENT_BASE "RequestRefresh", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_PortsChanged, SPA_TYPE_NODE_EVENT_BASE "PortsChanged", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_Error, SPA_TYPE_INFO_NODE_EVENT_BASE "Error", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_Buffering, SPA_TYPE_INFO_NODE_EVENT_BASE "Buffering", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_RequestRefresh, SPA_TYPE_INFO_NODE_EVENT_BASE "RequestRefresh", SPA_TYPE_Int, NULL },
{ SPA_NODE_EVENT_PortsChanged, SPA_TYPE_INFO_NODE_EVENT_BASE "PortsChanged", SPA_TYPE_Int, NULL },
{ 0, NULL, 0, NULL },
};
static const struct spa_type_info spa_type_node_event[] = {
{ 0, SPA_TYPE_NODE_EVENT_BASE, SPA_TYPE_Id, spa_type_node_event_id },
{ 0, SPA_TYPE_INFO_NODE_EVENT_BASE, SPA_TYPE_Id, spa_type_node_event_id },
{ 0, NULL, 0, NULL },
};
#define SPA_TYPE__NodeCommand SPA_TYPE_COMMAND_BASE "Node"
#define SPA_TYPE_NODE_COMMAND_BASE SPA_TYPE__NodeCommand ":"
#define SPA_TYPE_INFO_NodeCommand SPA_TYPE_INFO_COMMAND_BASE "Node"
#define SPA_TYPE_INFO_NODE_COMMAND_BASE SPA_TYPE_INFO_NodeCommand ":"
static const struct spa_type_info spa_type_node_command_id[] = {
{ SPA_NODE_COMMAND_Suspend, SPA_TYPE_NODE_COMMAND_BASE "Suspend", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Pause, SPA_TYPE_NODE_COMMAND_BASE "Pause", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Start, SPA_TYPE_NODE_COMMAND_BASE "Start", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Enable, SPA_TYPE_NODE_COMMAND_BASE "Enable", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Disable, SPA_TYPE_NODE_COMMAND_BASE "Disable", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Flush, SPA_TYPE_NODE_COMMAND_BASE "Flush", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Drain, SPA_TYPE_NODE_COMMAND_BASE "Drain", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Marker, SPA_TYPE_NODE_COMMAND_BASE "Marker", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Suspend, SPA_TYPE_INFO_NODE_COMMAND_BASE "Suspend", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Pause, SPA_TYPE_INFO_NODE_COMMAND_BASE "Pause", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Start, SPA_TYPE_INFO_NODE_COMMAND_BASE "Start", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Enable, SPA_TYPE_INFO_NODE_COMMAND_BASE "Enable", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Disable, SPA_TYPE_INFO_NODE_COMMAND_BASE "Disable", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Flush, SPA_TYPE_INFO_NODE_COMMAND_BASE "Flush", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Drain, SPA_TYPE_INFO_NODE_COMMAND_BASE "Drain", SPA_TYPE_Int, NULL },
{ SPA_NODE_COMMAND_Marker, SPA_TYPE_INFO_NODE_COMMAND_BASE "Marker", SPA_TYPE_Int, NULL },
{ 0, NULL, 0, NULL },
};
static const struct spa_type_info spa_type_node_command[] = {
{ 0, SPA_TYPE_NODE_COMMAND_BASE, SPA_TYPE_Id, spa_type_node_command_id },
{ 0, SPA_TYPE_INFO_NODE_COMMAND_BASE, SPA_TYPE_Id, spa_type_node_command_id },
{ 0, NULL, 0, NULL },
};
@ -90,4 +90,4 @@ static const struct spa_type_info spa_type_node_command[] = {
} /* extern "C" */
#endif
#endif /* _SPA_NODE_TYPES_H__ */
#endif /* SPA_NODE_TYPES_H */