From 3dc6820e9eb033338d2256e0fdd054766581df7b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 14 Jan 2019 12:58:23 +0100 Subject: [PATCH] Don't use __ in defines or declarations, it's reserved SPA_TYPE -> SPA_TYPE_INFO for type info strings improve includes Fixes #115 --- spa/include/spa/buffer/alloc.h | 6 +- spa/include/spa/buffer/buffer.h | 6 +- spa/include/spa/buffer/meta.h | 6 +- spa/include/spa/buffer/type-info.h | 46 +-- spa/include/spa/control/control.h | 6 +- spa/include/spa/control/type-info.h | 16 +- spa/include/spa/debug/buffer.h | 6 +- spa/include/spa/debug/dict.h | 6 +- spa/include/spa/debug/format.h | 6 +- spa/include/spa/debug/mem.h | 6 +- spa/include/spa/debug/node.h | 6 +- spa/include/spa/debug/pod.h | 6 +- spa/include/spa/debug/types.h | 6 +- spa/include/spa/graph/graph.h | 6 +- spa/include/spa/monitor/device.h | 6 +- spa/include/spa/monitor/monitor.h | 6 +- spa/include/spa/monitor/type-info.h | 56 ++-- spa/include/spa/node/command.h | 6 +- spa/include/spa/node/event.h | 6 +- spa/include/spa/node/io.h | 6 +- spa/include/spa/node/node.h | 6 +- spa/include/spa/node/type-info.h | 62 ++-- spa/include/spa/param/audio/format-utils.h | 6 +- spa/include/spa/param/audio/format.h | 6 +- spa/include/spa/param/audio/layout.h | 6 +- spa/include/spa/param/audio/raw.h | 6 +- spa/include/spa/param/audio/type-info.h | 176 +++++----- spa/include/spa/param/format-utils.h | 6 +- spa/include/spa/param/format.h | 6 +- spa/include/spa/param/param.h | 6 +- spa/include/spa/param/props.h | 6 +- spa/include/spa/param/type-info.h | 314 +++++++++--------- spa/include/spa/param/video/chroma.h | 6 +- spa/include/spa/param/video/color.h | 6 +- spa/include/spa/param/video/encoded.h | 6 +- spa/include/spa/param/video/format-utils.h | 6 +- spa/include/spa/param/video/format.h | 6 +- spa/include/spa/param/video/multiview.h | 6 +- spa/include/spa/param/video/raw.h | 6 +- spa/include/spa/param/video/type-info.h | 164 ++++----- spa/include/spa/pod/builder.h | 6 +- spa/include/spa/pod/command.h | 6 +- spa/include/spa/pod/compare.h | 4 +- spa/include/spa/pod/event.h | 6 +- spa/include/spa/pod/iter.h | 6 +- spa/include/spa/pod/parser.h | 12 +- spa/include/spa/pod/pod.h | 14 +- spa/include/spa/support/cpu.h | 6 +- spa/include/spa/support/dbus.h | 6 +- spa/include/spa/support/log-impl.h | 6 +- spa/include/spa/support/log.h | 6 +- spa/include/spa/support/loop.h | 6 +- spa/include/spa/support/plugin.h | 6 +- spa/include/spa/utils/defs.h | 12 +- spa/include/spa/utils/dict.h | 6 +- spa/include/spa/utils/hook.h | 6 +- spa/include/spa/utils/list.h | 6 +- spa/include/spa/utils/ringbuffer.h | 6 +- spa/include/spa/utils/type-info.h | 136 ++++---- spa/include/spa/utils/type.h | 44 +-- spa/plugins/alsa/alsa-utils.h | 6 +- spa/plugins/bluez5/defs.h | 6 +- spa/tests/test-props.c | 9 - src/daemon/daemon-config.h | 6 +- src/examples/export-sink.c | 2 - src/examples/export-spa.c | 1 - src/examples/local-v4l2.c | 2 - src/examples/media-session.c | 7 +- src/extensions/client-node.h | 6 +- src/extensions/protocol-native.h | 8 +- src/modules/module-access.c | 8 +- src/modules/module-audio-dsp.c | 5 +- src/modules/module-audio-dsp/audio-dsp.c | 6 +- src/modules/module-audio-dsp/audio-dsp.h | 6 +- src/modules/module-client-node.c | 5 +- src/modules/module-client-node/client-node.c | 4 +- src/modules/module-client-node/client-node.h | 6 +- .../module-client-node/client-stream.h | 6 +- .../module-client-node/protocol-native.c | 11 +- src/modules/module-link-factory.c | 6 +- src/modules/module-protocol-native.c | 19 +- .../module-protocol-native/connection.c | 2 +- .../module-protocol-native/connection.h | 6 +- .../module-protocol-native/local-socket.c | 1 - .../portal-screencast.c | 1 - .../module-protocol-native/protocol-native.c | 9 +- src/modules/module-rtkit.c | 7 +- src/modules/spa/module-node-factory.c | 5 +- src/modules/spa/spa-device.c | 1 + src/modules/spa/spa-device.h | 6 +- src/modules/spa/spa-monitor.h | 6 +- src/modules/spa/spa-node.h | 6 +- src/pipewire/array.h | 6 +- src/pipewire/client.c | 3 +- src/pipewire/client.h | 6 +- src/pipewire/command.c | 1 - src/pipewire/command.h | 6 +- src/pipewire/control.h | 6 +- src/pipewire/core.c | 4 + src/pipewire/core.h | 10 +- src/pipewire/data-loop.h | 6 +- src/pipewire/device.c | 3 +- src/pipewire/device.h | 6 +- src/pipewire/factory.c | 3 +- src/pipewire/factory.h | 6 +- src/pipewire/global.c | 3 +- src/pipewire/global.h | 6 +- src/pipewire/interfaces.h | 7 +- src/pipewire/introspect.h | 6 +- src/pipewire/link.c | 12 +- src/pipewire/link.h | 6 +- src/pipewire/log.h | 6 +- src/pipewire/loop.c | 1 + src/pipewire/loop.h | 6 +- src/pipewire/main-loop.h | 6 +- src/pipewire/map.h | 6 +- src/pipewire/mem.h | 6 +- src/pipewire/module.c | 2 +- src/pipewire/module.h | 6 +- src/pipewire/node.c | 2 +- src/pipewire/node.h | 8 +- src/pipewire/permission.h | 6 +- src/pipewire/pipewire.c | 21 +- src/pipewire/pipewire.h | 6 +- src/pipewire/port.c | 2 + src/pipewire/port.h | 6 +- src/pipewire/private.h | 10 +- src/pipewire/properties.c | 4 +- src/pipewire/properties.h | 6 +- src/pipewire/protocol.c | 1 + src/pipewire/protocol.h | 10 +- src/pipewire/proxy.c | 1 + src/pipewire/proxy.h | 6 +- src/pipewire/remote.c | 8 +- src/pipewire/remote.h | 8 +- src/pipewire/resource.c | 1 + src/pipewire/resource.h | 6 +- src/pipewire/stream.h | 6 +- src/pipewire/thread-loop.c | 2 +- src/pipewire/thread-loop.h | 6 +- src/pipewire/type.h | 24 +- src/pipewire/utils.h | 6 +- src/pipewire/version.h.in | 6 +- src/pipewire/work-queue.h | 6 +- src/tools/pipewire-cli.c | 1 + src/tools/pipewire-monitor.c | 4 +- 146 files changed, 890 insertions(+), 951 deletions(-) diff --git a/spa/include/spa/buffer/alloc.h b/spa/include/spa/buffer/alloc.h index 308ae659c..30a4f57f3 100644 --- a/spa/include/spa/buffer/alloc.h +++ b/spa/include/spa/buffer/alloc.h @@ -20,8 +20,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_BUFFER_ALLOC_H__ -#define __SPA_BUFFER_ALLOC_H__ +#ifndef SPA_BUFFER_ALLOC_H +#define SPA_BUFFER_ALLOC_H #ifdef __cplusplus extern "C" { @@ -189,4 +189,4 @@ spa_buffer_alloc_array(uint32_t n_buffers, uint32_t flags, } /* extern "C" */ #endif -#endif /* __SPA_BUFFER_ALLOC_H__ */ +#endif /* SPA_BUFFER_ALLOC_H */ diff --git a/spa/include/spa/buffer/buffer.h b/spa/include/spa/buffer/buffer.h index 2c0bd94da..dc1bc7b0c 100644 --- a/spa/include/spa/buffer/buffer.h +++ b/spa/include/spa/buffer/buffer.h @@ -21,8 +21,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_BUFFER_H__ -#define __SPA_BUFFER_H__ +#ifndef SPA_BUFFER_H +#define SPA_BUFFER_H #ifdef __cplusplus extern "C" { @@ -103,4 +103,4 @@ static inline void *spa_buffer_find_meta_data(const struct spa_buffer *b, uint32 } /* extern "C" */ #endif -#endif /* __SPA_BUFFER_H__ */ +#endif /* SPA_BUFFER_H */ diff --git a/spa/include/spa/buffer/meta.h b/spa/include/spa/buffer/meta.h index f01d86929..822067897 100644 --- a/spa/include/spa/buffer/meta.h +++ b/spa/include/spa/buffer/meta.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_META_H__ -#define __SPA_META_H__ +#ifndef SPA_META_H +#define SPA_META_H #ifdef __cplusplus extern "C" { @@ -138,4 +138,4 @@ struct spa_meta_cursor { } /* extern "C" */ #endif -#endif /* __SPA_META_H__ */ +#endif /* SPA_META_H */ diff --git a/spa/include/spa/buffer/type-info.h b/spa/include/spa/buffer/type-info.h index 0b6485b15..4b3a90439 100644 --- a/spa/include/spa/buffer/type-info.h +++ b/spa/include/spa/buffer/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_BUFFER_TYPES_H__ -#define __SPA_BUFFER_TYPES_H__ +#ifndef SPA_BUFFER_TYPES_H +#define SPA_BUFFER_TYPES_H #ifdef __cplusplus extern "C" { @@ -33,39 +33,39 @@ extern "C" { #include #include -#define SPA_TYPE__Buffer SPA_TYPE_POINTER_BASE "Buffer" -#define SPA_TYPE_BUFFER_BASE SPA_TYPE__Buffer ":" +#define SPA_TYPE_INFO_Buffer SPA_TYPE_INFO_POINTER_BASE "Buffer" +#define SPA_TYPE_INFO_BUFFER_BASE SPA_TYPE_INFO_Buffer ":" /** Buffers contain data of a certain type */ -#define SPA_TYPE__Data SPA_TYPE_ENUM_BASE "Data" -#define SPA_TYPE_DATA_BASE SPA_TYPE__Data ":" +#define SPA_TYPE_INFO_Data SPA_TYPE_INFO_ENUM_BASE "Data" +#define SPA_TYPE_INFO_DATA_BASE SPA_TYPE_INFO_Data ":" /** base type for fd based memory */ -#define SPA_TYPE_DATA__Fd SPA_TYPE_DATA_BASE "Fd" -#define SPA_TYPE_DATA_FD_BASE SPA_TYPE_DATA__Fd ":" +#define SPA_TYPE_INFO_DATA_Fd SPA_TYPE_INFO_DATA_BASE "Fd" +#define SPA_TYPE_INFO_DATA_FD_BASE SPA_TYPE_INFO_DATA_Fd ":" static const struct spa_type_info spa_type_data_type[] = { - { SPA_DATA_Invalid, SPA_TYPE_DATA_BASE "Invalid", SPA_TYPE_Int, NULL }, - { SPA_DATA_MemPtr, SPA_TYPE_DATA_BASE "MemPtr", SPA_TYPE_Int, NULL }, - { SPA_DATA_MemFd, SPA_TYPE_DATA_FD_BASE "MemFd", SPA_TYPE_Int, NULL }, - { SPA_DATA_DmaBuf, SPA_TYPE_DATA_FD_BASE "DmaBuf", SPA_TYPE_Int, NULL }, + { SPA_DATA_Invalid, SPA_TYPE_INFO_DATA_BASE "Invalid", SPA_TYPE_Int, NULL }, + { SPA_DATA_MemPtr, SPA_TYPE_INFO_DATA_BASE "MemPtr", SPA_TYPE_Int, NULL }, + { SPA_DATA_MemFd, SPA_TYPE_INFO_DATA_FD_BASE "MemFd", SPA_TYPE_Int, NULL }, + { SPA_DATA_DmaBuf, SPA_TYPE_INFO_DATA_FD_BASE "DmaBuf", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__Meta SPA_TYPE_POINTER_BASE "Meta" -#define SPA_TYPE_META_BASE SPA_TYPE__Meta ":" +#define SPA_TYPE_INFO_Meta SPA_TYPE_INFO_POINTER_BASE "Meta" +#define SPA_TYPE_INFO_META_BASE SPA_TYPE_INFO_Meta ":" -#define SPA_TYPE_META__Region SPA_TYPE_META_BASE "Region" -#define SPA_TYPE_META_REGION_BASE SPA_TYPE_META__Region ":" +#define SPA_TYPE_INFO_META_Region SPA_TYPE_INFO_META_BASE "Region" +#define SPA_TYPE_INFO_META_REGION_BASE SPA_TYPE_INFO_META_Region ":" -#define SPA_TYPE_META__RegionArray SPA_TYPE_META_BASE "RegionArray" -#define SPA_TYPE_META_REGION_ARRAY_BASE SPA_TYPE_META__RegionArray ":" +#define SPA_TYPE_INFO_META_RegionArray SPA_TYPE_INFO_META_BASE "RegionArray" +#define SPA_TYPE_INFO_META_REGION_ARRAY_BASE SPA_TYPE_INFO_META_RegionArray ":" static const struct spa_type_info spa_type_meta_type[] = { - { SPA_META_Invalid, SPA_TYPE_META_BASE "Invalid", SPA_TYPE_Pointer, NULL }, - { SPA_META_Header, SPA_TYPE_META_BASE "Header", SPA_TYPE_Pointer, NULL }, - { SPA_META_VideoCrop, SPA_TYPE_META_REGION_BASE "VideoCrop", SPA_TYPE_Pointer, NULL }, - { SPA_META_VideoDamage, SPA_TYPE_META_REGION_ARRAY_BASE "VideoDamage", SPA_TYPE_Pointer, NULL }, + { SPA_META_Invalid, SPA_TYPE_INFO_META_BASE "Invalid", SPA_TYPE_Pointer, NULL }, + { SPA_META_Header, SPA_TYPE_INFO_META_BASE "Header", SPA_TYPE_Pointer, NULL }, + { SPA_META_VideoCrop, SPA_TYPE_INFO_META_REGION_BASE "VideoCrop", SPA_TYPE_Pointer, NULL }, + { SPA_META_VideoDamage, SPA_TYPE_INFO_META_REGION_ARRAY_BASE "VideoDamage", SPA_TYPE_Pointer, NULL }, { 0, NULL, 0, NULL }, }; @@ -73,4 +73,4 @@ static const struct spa_type_info spa_type_meta_type[] = { } /* extern "C" */ #endif -#endif /* __SPA_BUFFER_TYPES_H__ */ +#endif /* SPA_BUFFER_TYPES_H */ diff --git a/spa/include/spa/control/control.h b/spa/include/spa/control/control.h index 2b9129155..09a3be215 100644 --- a/spa/include/spa/control/control.h +++ b/spa/include/spa/control/control.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_CONTROL_H__ -#define __SPA_CONTROL_H__ +#ifndef SPA_CONTROL_H +#define SPA_CONTROL_H #ifdef __cplusplus extern "C" { @@ -48,4 +48,4 @@ enum spa_control_type { } /* extern "C" */ #endif -#endif /* __SPA_CONTROL_H__ */ +#endif /* SPA_CONTROL_H */ diff --git a/spa/include/spa/control/type-info.h b/spa/include/spa/control/type-info.h index 3625d4193..8fa781117 100644 --- a/spa/include/spa/control/type-info.h +++ b/spa/include/spa/control/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_CONTROL_TYPES_H__ -#define __SPA_CONTROL_TYPES_H__ +#ifndef SPA_CONTROL_TYPES_H +#define SPA_CONTROL_TYPES_H #ifdef __cplusplus extern "C" { @@ -34,13 +34,13 @@ extern "C" { #include /* base for parameter object enumerations */ -#define SPA_TYPE__Control SPA_TYPE_ENUM_BASE "Control" -#define SPA_TYPE_CONTROL_BASE SPA_TYPE__Control ":" +#define SPA_TYPE_INFO_Control SPA_TYPE_INFO_ENUM_BASE "Control" +#define SPA_TYPE_INFO_CONTROL_BASE SPA_TYPE_INFO_Control ":" static const struct spa_type_info spa_type_control[] = { - { SPA_CONTROL_Invalid, SPA_TYPE_CONTROL_BASE "Invalid", SPA_TYPE_Int, NULL }, - { SPA_CONTROL_Properties, SPA_TYPE_CONTROL_BASE "Properties", SPA_TYPE_Int, NULL }, - { SPA_CONTROL_Midi, SPA_TYPE_CONTROL_BASE "Midi", SPA_TYPE_Int, NULL }, + { SPA_CONTROL_Invalid, SPA_TYPE_INFO_CONTROL_BASE "Invalid", SPA_TYPE_Int, NULL }, + { SPA_CONTROL_Properties, SPA_TYPE_INFO_CONTROL_BASE "Properties", SPA_TYPE_Int, NULL }, + { SPA_CONTROL_Midi, SPA_TYPE_INFO_CONTROL_BASE "Midi", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; @@ -48,4 +48,4 @@ static const struct spa_type_info spa_type_control[] = { } /* extern "C" */ #endif -#endif /* __SPA_CONTROL_TYPES_H__ */ +#endif /* SPA_CONTROL_TYPES_H */ diff --git a/spa/include/spa/debug/buffer.h b/spa/include/spa/debug/buffer.h index d88916c9c..a75e32088 100644 --- a/spa/include/spa/debug/buffer.h +++ b/spa/include/spa/debug/buffer.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_BUFFER_H__ -#define __SPA_DEBUG_BUFFER_H__ +#ifndef SPA_DEBUG_BUFFER_H +#define SPA_DEBUG_BUFFER_H #ifdef __cplusplus extern "C" { @@ -115,4 +115,4 @@ static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer) } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_BUFFER_H__ */ +#endif /* SPA_DEBUG_BUFFER_H */ diff --git a/spa/include/spa/debug/dict.h b/spa/include/spa/debug/dict.h index d92191357..94fc59a2e 100644 --- a/spa/include/spa/debug/dict.h +++ b/spa/include/spa/debug/dict.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_DICT_H__ -#define __SPA_DEBUG_DICT_H__ +#ifndef SPA_DEBUG_DICT_H +#define SPA_DEBUG_DICT_H #ifdef __cplusplus extern "C" { @@ -48,4 +48,4 @@ static inline int spa_debug_dict(int indent, const struct spa_dict *dict) } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_DICT_H__ */ +#endif /* SPA_DEBUG_DICT_H */ diff --git a/spa/include/spa/debug/format.h b/spa/include/spa/debug/format.h index ecb8d7190..0ae48c1ef 100644 --- a/spa/include/spa/debug/format.h +++ b/spa/include/spa/debug/format.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_FORMAT_H__ -#define __SPA_DEBUG_FORMAT_H__ +#ifndef SPA_DEBUG_FORMAT_H +#define SPA_DEBUG_FORMAT_H #ifdef __cplusplus extern "C" { @@ -202,4 +202,4 @@ static inline int spa_debug_format(int indent, } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_FORMAT_H__ */ +#endif /* SPA_DEBUG_FORMAT_H */ diff --git a/spa/include/spa/debug/mem.h b/spa/include/spa/debug/mem.h index 4f0eb10b5..dfc5b73cb 100644 --- a/spa/include/spa/debug/mem.h +++ b/spa/include/spa/debug/mem.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_MEM_H__ -#define __SPA_DEBUG_MEM_H__ +#ifndef SPA_DEBUG_MEM_H +#define SPA_DEBUG_MEM_H #ifdef __cplusplus extern "C" { @@ -57,4 +57,4 @@ static inline int spa_debug_mem(int indent, const void *data, size_t size) } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_MEM_H__ */ +#endif /* SPA_DEBUG_MEM_H */ diff --git a/spa/include/spa/debug/node.h b/spa/include/spa/debug/node.h index cf2e5b909..aa72af45a 100644 --- a/spa/include/spa/debug/node.h +++ b/spa/include/spa/debug/node.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_NODE_H__ -#define __SPA_DEBUG_NODE_H__ +#ifndef SPA_DEBUG_NODE_H +#define SPA_DEBUG_NODE_H #ifdef __cplusplus extern "C" { @@ -54,4 +54,4 @@ int spa_debug_port_info(int indent, const struct spa_port_info *info) } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_NODE_H__ */ +#endif /* SPA_DEBUG_NODE_H */ diff --git a/spa/include/spa/debug/pod.h b/spa/include/spa/debug/pod.h index 891d41e49..a8491adf6 100644 --- a/spa/include/spa/debug/pod.h +++ b/spa/include/spa/debug/pod.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_POD_H__ -#define __SPA_DEBUG_POD_H__ +#ifndef SPA_DEBUG_POD_H +#define SPA_DEBUG_POD_H #ifdef __cplusplus extern "C" { @@ -271,4 +271,4 @@ static inline int spa_debug_pod(int indent, } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_POD_H__ */ +#endif /* SPA_DEBUG_POD_H */ diff --git a/spa/include/spa/debug/types.h b/spa/include/spa/debug/types.h index bce37c142..ae24999d8 100644 --- a/spa/include/spa/debug/types.h +++ b/spa/include/spa/debug/types.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEBUG_TYPES_H__ -#define __SPA_DEBUG_TYPES_H__ +#ifndef SPA_DEBUG_TYPES_H +#define SPA_DEBUG_TYPES_H #ifdef __cplusplus extern "C" { @@ -77,4 +77,4 @@ static inline uint32_t spa_debug_type_find_type(const struct spa_type_info *info } /* extern "C" */ #endif -#endif /* __SPA_DEBUG_NODE_H__ */ +#endif /* SPA_DEBUG_NODE_H */ diff --git a/spa/include/spa/graph/graph.h b/spa/include/spa/graph/graph.h index dbcb191aa..c90cff209 100644 --- a/spa/include/spa/graph/graph.h +++ b/spa/include/spa/graph/graph.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_GRAPH_H__ -#define __SPA_GRAPH_H__ +#ifndef SPA_GRAPH_H +#define SPA_GRAPH_H #ifdef __cplusplus extern "C" { @@ -339,4 +339,4 @@ static const struct spa_graph_node_callbacks spa_graph_node_impl_default = { } /* extern "C" */ #endif -#endif /* __SPA_GRAPH_H__ */ +#endif /* SPA_GRAPH_H */ diff --git a/spa/include/spa/monitor/device.h b/spa/include/spa/monitor/device.h index d4eee3003..01f9cd8d0 100644 --- a/spa/include/spa/monitor/device.h +++ b/spa/include/spa/monitor/device.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DEVICE_H__ -#define __SPA_DEVICE_H__ +#ifndef SPA_DEVICE_H +#define SPA_DEVICE_H #ifdef __cplusplus extern "C" { @@ -148,4 +148,4 @@ struct spa_device { } /* extern "C" */ #endif -#endif /* __SPA_DEVICE_H__ */ +#endif /* SPA_DEVICE_H */ diff --git a/spa/include/spa/monitor/monitor.h b/spa/include/spa/monitor/monitor.h index 52aa4500f..fcd475b1d 100644 --- a/spa/include/spa/monitor/monitor.h +++ b/spa/include/spa/monitor/monitor.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_MONITOR_H__ -#define __SPA_MONITOR_H__ +#ifndef SPA_MONITOR_H +#define SPA_MONITOR_H #ifdef __cplusplus extern "C" { @@ -119,4 +119,4 @@ struct spa_monitor { } /* extern "C" */ #endif -#endif /* __SPA_MONITOR_H__ */ +#endif /* SPA_MONITOR_H */ diff --git a/spa/include/spa/monitor/type-info.h b/spa/include/spa/monitor/type-info.h index 5a9572a59..492d703ba 100644 --- a/spa/include/spa/monitor/type-info.h +++ b/spa/include/spa/monitor/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_MONITOR_TYPES_H__ -#define __SPA_MONITOR_TYPES_H__ +#ifndef SPA_MONITOR_TYPES_H +#define SPA_MONITOR_TYPES_H #ifdef __cplusplus extern "C" { @@ -32,54 +32,54 @@ extern "C" { #include #include -#define SPA_TYPE__MonitorEvent SPA_TYPE_EVENT_BASE "Monitor" -#define SPA_TYPE_MONITOR_EVENT_BASE SPA_TYPE__MonitorEvent ":" +#define SPA_TYPE_INFO_MonitorEvent SPA_TYPE_INFO_EVENT_BASE "Monitor" +#define SPA_TYPE_INFO_MONITOR_EVENT_BASE SPA_TYPE_INFO_MonitorEvent ":" static const struct spa_type_info spa_type_monitor_event_id[] = { - { SPA_MONITOR_EVENT_Added, SPA_TYPE_MONITOR_EVENT_BASE "Added", SPA_TYPE_Int, NULL }, - { SPA_MONITOR_EVENT_Removed, SPA_TYPE_MONITOR_EVENT_BASE "Removed", SPA_TYPE_Int, NULL }, - { SPA_MONITOR_EVENT_Changed, SPA_TYPE_MONITOR_EVENT_BASE "Changed", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_EVENT_Added, SPA_TYPE_INFO_MONITOR_EVENT_BASE "Added", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_EVENT_Removed, SPA_TYPE_INFO_MONITOR_EVENT_BASE "Removed", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_EVENT_Changed, SPA_TYPE_INFO_MONITOR_EVENT_BASE "Changed", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; static const struct spa_type_info spa_type_monitor_event[] = { - { 0, SPA_TYPE_MONITOR_EVENT_BASE, SPA_TYPE_Id, spa_type_monitor_event_id }, + { 0, SPA_TYPE_INFO_MONITOR_EVENT_BASE, SPA_TYPE_Id, spa_type_monitor_event_id }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__MonitorItemFlags SPA_TYPE_FLAGS_BASE "MonitorItemFlags" -#define SPA_TYPE_MONITOR_ITEM_FLAGS_BASE SPA_TYPE__MonitorItemFlags ":" +#define SPA_TYPE_INFO_MonitorItemFlags SPA_TYPE_INFO_FLAGS_BASE "MonitorItemFlags" +#define SPA_TYPE_INFO_MONITOR_ITEM_FLAGS_BASE SPA_TYPE_INFO_MonitorItemFlags ":" static const struct spa_type_info spa_type_monitor_item_flags[] = { - { SPA_MONITOR_ITEM_FLAG_NONE, SPA_TYPE_MONITOR_ITEM_FLAGS_BASE "none", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_ITEM_FLAG_NONE, SPA_TYPE_INFO_MONITOR_ITEM_FLAGS_BASE "none", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__MonitorItemState SPA_TYPE_ENUM_BASE "MonitorItemState" -#define SPA_TYPE_MONITOR_ITEM_STATE_BASE SPA_TYPE__MonitorItemState ":" +#define SPA_TYPE_INFO_MonitorItemState SPA_TYPE_INFO_ENUM_BASE "MonitorItemState" +#define SPA_TYPE_INFO_MONITOR_ITEM_STATE_BASE SPA_TYPE_INFO_MonitorItemState ":" static const struct spa_type_info spa_type_monitor_item_state[] = { - { SPA_MONITOR_ITEM_STATE_Available, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Available", SPA_TYPE_Int, NULL }, - { SPA_MONITOR_ITEM_STATE_Disabled, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Disabled", SPA_TYPE_Int, NULL }, - { SPA_MONITOR_ITEM_STATE_Unavailable, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Unavailable", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_ITEM_STATE_Available, SPA_TYPE_INFO_MONITOR_ITEM_STATE_BASE "Available", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_ITEM_STATE_Disabled, SPA_TYPE_INFO_MONITOR_ITEM_STATE_BASE "Disabled", SPA_TYPE_Int, NULL }, + { SPA_MONITOR_ITEM_STATE_Unavailable, SPA_TYPE_INFO_MONITOR_ITEM_STATE_BASE "Unavailable", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__MonitorItem SPA_TYPE_OBJECT_BASE "MonitorItem" -#define SPA_TYPE_MONITOR_ITEM_BASE SPA_TYPE__MonitorItem ":" +#define SPA_TYPE_INFO_MonitorItem SPA_TYPE_INFO_OBJECT_BASE "MonitorItem" +#define SPA_TYPE_INFO_MONITOR_ITEM_BASE SPA_TYPE_INFO_MonitorItem ":" static const struct spa_type_info spa_type_monitor_item[] = { - { SPA_MONITOR_ITEM_START, SPA_TYPE_MONITOR_ITEM_BASE, SPA_TYPE_Int, NULL }, - { SPA_MONITOR_ITEM_id, SPA_TYPE_MONITOR_ITEM_BASE "id", SPA_TYPE_String, NULL }, - { SPA_MONITOR_ITEM_flags, SPA_TYPE_MONITOR_ITEM_BASE "flags", SPA_TYPE_Id, + { SPA_MONITOR_ITEM_START, SPA_TYPE_INFO_MONITOR_ITEM_BASE, SPA_TYPE_Int, NULL }, + { SPA_MONITOR_ITEM_id, SPA_TYPE_INFO_MONITOR_ITEM_BASE "id", SPA_TYPE_String, NULL }, + { SPA_MONITOR_ITEM_flags, SPA_TYPE_INFO_MONITOR_ITEM_BASE "flags", SPA_TYPE_Id, spa_type_monitor_item_flags }, - { SPA_MONITOR_ITEM_state, SPA_TYPE_MONITOR_ITEM_BASE "state", SPA_TYPE_Id, + { SPA_MONITOR_ITEM_state, SPA_TYPE_INFO_MONITOR_ITEM_BASE "state", SPA_TYPE_Id, spa_type_monitor_item_state }, - { SPA_MONITOR_ITEM_name, SPA_TYPE_MONITOR_ITEM_BASE "name", SPA_TYPE_String, NULL }, - { SPA_MONITOR_ITEM_class, SPA_TYPE_MONITOR_ITEM_BASE "class", SPA_TYPE_String, NULL }, - { SPA_MONITOR_ITEM_info, SPA_TYPE_MONITOR_ITEM_BASE "info", SPA_TYPE_Pod, NULL }, - { SPA_MONITOR_ITEM_factory, SPA_TYPE_MONITOR_ITEM_BASE "factory", SPA_TYPE_Pointer, NULL }, - { SPA_MONITOR_ITEM_type, SPA_TYPE_MONITOR_ITEM_BASE "type", SPA_TYPE_Id, NULL }, + { SPA_MONITOR_ITEM_name, SPA_TYPE_INFO_MONITOR_ITEM_BASE "name", SPA_TYPE_String, NULL }, + { SPA_MONITOR_ITEM_class, SPA_TYPE_INFO_MONITOR_ITEM_BASE "class", SPA_TYPE_String, NULL }, + { SPA_MONITOR_ITEM_info, SPA_TYPE_INFO_MONITOR_ITEM_BASE "info", SPA_TYPE_Pod, NULL }, + { SPA_MONITOR_ITEM_factory, SPA_TYPE_INFO_MONITOR_ITEM_BASE "factory", SPA_TYPE_Pointer, NULL }, + { SPA_MONITOR_ITEM_type, SPA_TYPE_INFO_MONITOR_ITEM_BASE "type", SPA_TYPE_Id, NULL }, { 0, NULL, 0, NULL }, }; @@ -87,4 +87,4 @@ static const struct spa_type_info spa_type_monitor_item[] = { } /* extern "C" */ #endif -#endif /* __SPA_MONITOR_TYPES_H__ */ +#endif /* SPA_MONITOR_TYPES_H */ diff --git a/spa/include/spa/node/command.h b/spa/include/spa/node/command.h index fa816d67b..bbce4a7fe 100644 --- a/spa/include/spa/node/command.h +++ b/spa/include/spa/node/command.h @@ -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 */ diff --git a/spa/include/spa/node/event.h b/spa/include/spa/node/event.h index 8a5873dad..a6401b9dc 100644 --- a/spa/include/spa/node/event.h +++ b/spa/include/spa/node/event.h @@ -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 */ diff --git a/spa/include/spa/node/io.h b/spa/include/spa/node/io.h index 5f163fd3b..093093dff 100644 --- a/spa/include/spa/node/io.h +++ b/spa/include/spa/node/io.h @@ -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 */ diff --git a/spa/include/spa/node/node.h b/spa/include/spa/node/node.h index af634d87b..5592ae491 100644 --- a/spa/include/spa/node/node.h +++ b/spa/include/spa/node/node.h @@ -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 */ diff --git a/spa/include/spa/node/type-info.h b/spa/include/spa/node/type-info.h index 497c114c2..781a32bd8 100644 --- a/spa/include/spa/node/type-info.h +++ b/spa/include/spa/node/type-info.h @@ -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 #include -#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 */ diff --git a/spa/include/spa/param/audio/format-utils.h b/spa/include/spa/param/audio/format-utils.h index aa581ac71..2c7adcfad 100644 --- a/spa/include/spa/param/audio/format-utils.h +++ b/spa/include/spa/param/audio/format-utils.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_AUDIO_FORMAT_UTILS_H__ -#define __SPA_PARAM_AUDIO_FORMAT_UTILS_H__ +#ifndef SPA_PARAM_AUDIO_FORMAT_UTILS_H +#define SPA_PARAM_AUDIO_FORMAT_UTILS_H #ifdef __cplusplus extern "C" { @@ -90,4 +90,4 @@ spa_format_audio_raw_build(struct spa_pod_builder *builder, uint32_t id, struct } /* extern "C" */ #endif -#endif /* __SPA_PARAM_AUDIO_FORMAT_UTILS */ +#endif /* SPA_PARAM_AUDIO_FORMAT_UTILS_H */ diff --git a/spa/include/spa/param/audio/format.h b/spa/include/spa/param/audio/format.h index 92cf6ed3b..30e054c6a 100644 --- a/spa/include/spa/param/audio/format.h +++ b/spa/include/spa/param/audio/format.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_AUDIO_FORMAT_H__ -#define __SPA_PARAM_AUDIO_FORMAT_H__ +#ifndef SPA_PARAM_AUDIO_FORMAT_H +#define SPA_PARAM_AUDIO_FORMAT_H #ifdef __cplusplus extern "C" { @@ -44,4 +44,4 @@ struct spa_audio_info { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_AUDIO_FORMAT_H */ +#endif /* SPA_PARAM_AUDIO_FORMAT_H */ diff --git a/spa/include/spa/param/audio/layout.h b/spa/include/spa/param/audio/layout.h index 092c33427..6dca7992a 100644 --- a/spa/include/spa/param/audio/layout.h +++ b/spa/include/spa/param/audio/layout.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_AUDIO_LAYOUT_H__ -#define __SPA_AUDIO_LAYOUT_H__ +#ifndef SPA_AUDIO_LAYOUT_H +#define SPA_AUDIO_LAYOUT_H #ifdef __cplusplus extern "C" { @@ -172,4 +172,4 @@ extern "C" { } /* extern "C" */ #endif -#endif /* __SPA_AUDIO_LAYOUT_H__ */ +#endif /* SPA_AUDIO_LAYOUT_H */ diff --git a/spa/include/spa/param/audio/raw.h b/spa/include/spa/param/audio/raw.h index 1ece306d5..14be5fe35 100644 --- a/spa/include/spa/param/audio/raw.h +++ b/spa/include/spa/param/audio/raw.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_AUDIO_RAW_H__ -#define __SPA_AUDIO_RAW_H__ +#ifndef SPA_AUDIO_RAW_H +#define SPA_AUDIO_RAW_H #ifdef __cplusplus extern "C" { @@ -210,4 +210,4 @@ struct spa_audio_info_raw { } /* extern "C" */ #endif -#endif /* __SPA_AUDIO_RAW_H__ */ +#endif /* SPA_AUDIO_RAW_H */ diff --git a/spa/include/spa/param/audio/type-info.h b/spa/include/spa/param/audio/type-info.h index f0f361f3f..c1c5853ae 100644 --- a/spa/include/spa/param/audio/type-info.h +++ b/spa/include/spa/param/audio/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_AUDIO_TYPES_H__ -#define __SPA_AUDIO_TYPES_H__ +#ifndef SPA_AUDIO_TYPES_H +#define SPA_AUDIO_TYPES_H #ifdef __cplusplus extern "C" { @@ -31,105 +31,105 @@ extern "C" { #include -#define SPA_TYPE__AudioFormat SPA_TYPE_ENUM_BASE "AudioFormat" -#define SPA_TYPE_AUDIO_FORMAT_BASE SPA_TYPE__AudioFormat ":" +#define SPA_TYPE_INFO_AudioFormat SPA_TYPE_INFO_ENUM_BASE "AudioFormat" +#define SPA_TYPE_INFO_AUDIO_FORMAT_BASE SPA_TYPE_INFO_AudioFormat ":" static const struct spa_type_info spa_type_audio_format[] = { - { SPA_AUDIO_FORMAT_UNKNOWN, SPA_TYPE_AUDIO_FORMAT_BASE "UNKNOWN", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_ENCODED, SPA_TYPE_AUDIO_FORMAT_BASE "ENCODED", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S8, SPA_TYPE_AUDIO_FORMAT_BASE "S8", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U8, SPA_TYPE_AUDIO_FORMAT_BASE "U8", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S16_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S16LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S16_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S16BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U16_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U16LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U16_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U16BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24_32_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S24_32LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24_32_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S24_32BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U24_32_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U24_32LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U24_32_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U24_32BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S32_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S32LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S32_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S32BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U32_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U32LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U32_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U32BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S24LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S24BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U24_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U24LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U24_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U24BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S20_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S20LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S20_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S20BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U20_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U20LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U20_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U20BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S18_LE, SPA_TYPE_AUDIO_FORMAT_BASE "S18LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S18_BE, SPA_TYPE_AUDIO_FORMAT_BASE "S18BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U18_LE, SPA_TYPE_AUDIO_FORMAT_BASE "U18LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U18_BE, SPA_TYPE_AUDIO_FORMAT_BASE "U18BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F32_LE, SPA_TYPE_AUDIO_FORMAT_BASE "F32LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F32_BE, SPA_TYPE_AUDIO_FORMAT_BASE "F32BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F64_LE, SPA_TYPE_AUDIO_FORMAT_BASE "F64LE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F64_BE, SPA_TYPE_AUDIO_FORMAT_BASE "F64BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_UNKNOWN, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "UNKNOWN", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_ENCODED, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "ENCODED", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S8, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S8", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U8, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U8", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S16_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S16LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S16_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S16BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U16_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U16LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U16_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U16BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24_32_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24_32LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24_32_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24_32BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U24_32_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U24_32LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U24_32_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U24_32BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S32_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S32LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S32_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S32BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U32_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U32LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U32_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U32BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U24_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U24LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U24_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U24BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S20_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S20LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S20_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S20BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U20_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U20LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U20_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U20BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S18_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S18LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S18_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S18BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U18_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U18LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U18_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U18BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F32_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F32LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F32_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F32BE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F64_LE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F64LE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F64_BE, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F64BE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_U8P, SPA_TYPE_AUDIO_FORMAT_BASE "U8P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S16P, SPA_TYPE_AUDIO_FORMAT_BASE "S16P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24_32P, SPA_TYPE_AUDIO_FORMAT_BASE "S24_32P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S32P, SPA_TYPE_AUDIO_FORMAT_BASE "S32P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_S24P, SPA_TYPE_AUDIO_FORMAT_BASE "S24P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F32P, SPA_TYPE_AUDIO_FORMAT_BASE "F32P", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FORMAT_F64P, SPA_TYPE_AUDIO_FORMAT_BASE "F64P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_U8P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "U8P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S16P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S16P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24_32P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24_32P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S32P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S32P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_S24P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "S24P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F32P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F32P", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FORMAT_F64P, SPA_TYPE_INFO_AUDIO_FORMAT_BASE "F64P", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__AudioFlags SPA_TYPE_FLAGS_BASE "AudioFlags" -#define SPA_TYPE_AUDIO_FLAGS_BASE SPA_TYPE__AudioFlags ":" +#define SPA_TYPE_INFO_AudioFlags SPA_TYPE_INFO_FLAGS_BASE "AudioFlags" +#define SPA_TYPE_INFO_AUDIO_FLAGS_BASE SPA_TYPE_INFO_AudioFlags ":" static const struct spa_type_info spa_type_audio_flags[] = { - { SPA_AUDIO_FLAG_NONE, SPA_TYPE_AUDIO_FLAGS_BASE "none", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_FLAG_UNPOSITIONED, SPA_TYPE_AUDIO_FLAGS_BASE "unpositioned", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FLAG_NONE, SPA_TYPE_INFO_AUDIO_FLAGS_BASE "none", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_FLAG_UNPOSITIONED, SPA_TYPE_INFO_AUDIO_FLAGS_BASE "unpositioned", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__AudioChannel SPA_TYPE_ENUM_BASE "AudioChannel" -#define SPA_TYPE_AUDIO_CHANNEL_BASE SPA_TYPE__AudioChannel ":" +#define SPA_TYPE_INFO_AudioChannel SPA_TYPE_INFO_ENUM_BASE "AudioChannel" +#define SPA_TYPE_INFO_AUDIO_CHANNEL_BASE SPA_TYPE_INFO_AudioChannel ":" static const struct spa_type_info spa_type_audio_channel[] = { - { SPA_AUDIO_CHANNEL_UNKNOWN, SPA_TYPE_AUDIO_CHANNEL_BASE "UNK", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_NA, SPA_TYPE_AUDIO_CHANNEL_BASE "NA", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_MONO, SPA_TYPE_AUDIO_CHANNEL_BASE "MONO", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FL, SPA_TYPE_AUDIO_CHANNEL_BASE "FL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FR, SPA_TYPE_AUDIO_CHANNEL_BASE "FR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FC, SPA_TYPE_AUDIO_CHANNEL_BASE "FC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_LFE, SPA_TYPE_AUDIO_CHANNEL_BASE "LFE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_SL, SPA_TYPE_AUDIO_CHANNEL_BASE "SL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_SR, SPA_TYPE_AUDIO_CHANNEL_BASE "SR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FLC, SPA_TYPE_AUDIO_CHANNEL_BASE "FLC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FRC, SPA_TYPE_AUDIO_CHANNEL_BASE "FRC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RC, SPA_TYPE_AUDIO_CHANNEL_BASE "RC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RL, SPA_TYPE_AUDIO_CHANNEL_BASE "RL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RR, SPA_TYPE_AUDIO_CHANNEL_BASE "RR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TC, SPA_TYPE_AUDIO_CHANNEL_BASE "TC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TFL, SPA_TYPE_AUDIO_CHANNEL_BASE "TFL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TFC, SPA_TYPE_AUDIO_CHANNEL_BASE "TFC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TFR, SPA_TYPE_AUDIO_CHANNEL_BASE "TFR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TRL, SPA_TYPE_AUDIO_CHANNEL_BASE "TRL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TRC, SPA_TYPE_AUDIO_CHANNEL_BASE "TRC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TRR, SPA_TYPE_AUDIO_CHANNEL_BASE "TRR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RLC, SPA_TYPE_AUDIO_CHANNEL_BASE "RLC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RRC, SPA_TYPE_AUDIO_CHANNEL_BASE "RRC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FLW, SPA_TYPE_AUDIO_CHANNEL_BASE "FLW", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FRW, SPA_TYPE_AUDIO_CHANNEL_BASE "FRW", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_LFE2, SPA_TYPE_AUDIO_CHANNEL_BASE "LFE2", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FLH, SPA_TYPE_AUDIO_CHANNEL_BASE "FLH", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FCH, SPA_TYPE_AUDIO_CHANNEL_BASE "FCH", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_FRH, SPA_TYPE_AUDIO_CHANNEL_BASE "FRH", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TFLC, SPA_TYPE_AUDIO_CHANNEL_BASE "TFLC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TFRC, SPA_TYPE_AUDIO_CHANNEL_BASE "TFRC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TSL, SPA_TYPE_AUDIO_CHANNEL_BASE "TSL", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_TSR, SPA_TYPE_AUDIO_CHANNEL_BASE "TSR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_LLFE, SPA_TYPE_AUDIO_CHANNEL_BASE "LLFR", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_RLFE, SPA_TYPE_AUDIO_CHANNEL_BASE "RLFE", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_BC, SPA_TYPE_AUDIO_CHANNEL_BASE "BC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_BLC, SPA_TYPE_AUDIO_CHANNEL_BASE "BLC", SPA_TYPE_Int, NULL }, - { SPA_AUDIO_CHANNEL_BRC, SPA_TYPE_AUDIO_CHANNEL_BASE "BRC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_UNKNOWN, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "UNK", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_NA, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "NA", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_MONO, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "MONO", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_LFE, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "LFE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_SL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "SL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_SR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "SR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FLC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FLC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FRC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FRC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TFL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TFL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TFC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TFC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TFR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TFR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TRL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TRL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TRC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TRC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TRR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TRR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RLC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RLC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RRC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RRC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FLW, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FLW", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FRW, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FRW", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_LFE2, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "LFE2", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FLH, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FLH", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FCH, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FCH", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_FRH, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "FRH", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TFLC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TFLC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TFRC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TFRC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TSL, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TSL", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_TSR, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "TSR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_LLFE, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "LLFR", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_RLFE, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "RLFE", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_BC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_BLC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BLC", SPA_TYPE_Int, NULL }, + { SPA_AUDIO_CHANNEL_BRC, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BRC", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; @@ -137,4 +137,4 @@ static const struct spa_type_info spa_type_audio_channel[] = { } /* extern "C" */ #endif -#endif /* __SPA_AUDIO_RAW_TYPES_H__ */ +#endif /* SPA_AUDIO_RAW_TYPES_H */ diff --git a/spa/include/spa/param/format-utils.h b/spa/include/spa/param/format-utils.h index ee92eeb00..98a371f47 100644 --- a/spa/include/spa/param/format-utils.h +++ b/spa/include/spa/param/format-utils.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_FORMAT_UTILS_H__ -#define __SPA_PARAM_FORMAT_UTILS_H__ +#ifndef SPA_PARAM_FORMAT_UTILS_H +#define SPA_PARAM_FORMAT_UTILS_H #ifdef __cplusplus extern "C" { @@ -45,4 +45,4 @@ spa_format_parse(const struct spa_pod *format, uint32_t *media_type, uint32_t *m } /* extern "C" */ #endif -#endif /* __SPA_PARAM_FORMAT_UTILS */ +#endif /* SPA_PARAM_FORMAT_UTILS_H */ diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h index 3b00738eb..61f18fc52 100644 --- a/spa/include/spa/param/format.h +++ b/spa/include/spa/param/format.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_FORMAT_H__ -#define __SPA_PARAM_FORMAT_H__ +#ifndef SPA_PARAM_FORMAT_H +#define SPA_PARAM_FORMAT_H #ifdef __cplusplus extern "C" { @@ -132,4 +132,4 @@ enum spa_format { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_FORMAT_H__ */ +#endif /* SPA_PARAM_FORMAT_H */ diff --git a/spa/include/spa/param/param.h b/spa/include/spa/param/param.h index ae5158f72..836dd357d 100644 --- a/spa/include/spa/param/param.h +++ b/spa/include/spa/param/param.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_H__ -#define __SPA_PARAM_H__ +#ifndef SPA_PARAM_H +#define SPA_PARAM_H #ifdef __cplusplus extern "C" { @@ -89,4 +89,4 @@ enum spa_param_profile { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_H__ */ +#endif /* SPA_PARAM_H */ diff --git a/spa/include/spa/param/props.h b/spa/include/spa/param/props.h index e67ff4da2..f76792387 100644 --- a/spa/include/spa/param/props.h +++ b/spa/include/spa/param/props.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_PROPS_H__ -#define __SPA_PARAM_PROPS_H__ +#ifndef SPA_PARAM_PROPS_H +#define SPA_PARAM_PROPS_H #ifdef __cplusplus extern "C" { @@ -91,4 +91,4 @@ enum spa_prop { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_PROPS_H__ */ +#endif /* SPA_PARAM_PROPS_H */ diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h index a8882853b..dab490ae0 100644 --- a/spa/include/spa/param/type-info.h +++ b/spa/include/spa/param/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_TYPES_H__ -#define __SPA_PARAM_TYPES_H__ +#ifndef SPA_PARAM_TYPES_H +#define SPA_PARAM_TYPES_H #ifdef __cplusplus extern "C" { @@ -36,239 +36,239 @@ extern "C" { #include /* base for parameter object enumerations */ -#define SPA_TYPE__ParamId SPA_TYPE_ENUM_BASE "ParamId" -#define SPA_TYPE_PARAM_ID_BASE SPA_TYPE__ParamId ":" +#define SPA_TYPE_INFO_ParamId SPA_TYPE_INFO_ENUM_BASE "ParamId" +#define SPA_TYPE_INFO_PARAM_ID_BASE SPA_TYPE_INFO_ParamId ":" static const struct spa_type_info spa_type_param[] = { - { SPA_PARAM_Invalid, SPA_TYPE_PARAM_ID_BASE "Invalid", SPA_TYPE_Int, NULL }, - { SPA_PARAM_List, SPA_TYPE_PARAM_ID_BASE "List", SPA_TYPE_Int, NULL }, - { SPA_PARAM_PropInfo, SPA_TYPE_PARAM_ID_BASE "PropInfo", SPA_TYPE_Int, NULL }, - { SPA_PARAM_Props, SPA_TYPE_PARAM_ID_BASE "Props", SPA_TYPE_Int, NULL }, - { SPA_PARAM_EnumFormat, SPA_TYPE_PARAM_ID_BASE "EnumFormat", SPA_TYPE_Int, NULL }, - { SPA_PARAM_Format, SPA_TYPE_PARAM_ID_BASE "Format", SPA_TYPE_Int, NULL }, - { SPA_PARAM_Buffers, SPA_TYPE_PARAM_ID_BASE "Buffers", SPA_TYPE_Int, NULL }, - { SPA_PARAM_Meta, SPA_TYPE_PARAM_ID_BASE "Meta", SPA_TYPE_Int, NULL }, - { SPA_PARAM_IO, SPA_TYPE_PARAM_ID_BASE "IO", SPA_TYPE_Int, NULL }, - { SPA_PARAM_Profile, SPA_TYPE_PARAM_ID_BASE "Profile", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Invalid, SPA_TYPE_INFO_PARAM_ID_BASE "Invalid", SPA_TYPE_Int, NULL }, + { SPA_PARAM_List, SPA_TYPE_INFO_PARAM_ID_BASE "List", SPA_TYPE_Int, NULL }, + { SPA_PARAM_PropInfo, SPA_TYPE_INFO_PARAM_ID_BASE "PropInfo", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Props, SPA_TYPE_INFO_PARAM_ID_BASE "Props", SPA_TYPE_Int, NULL }, + { SPA_PARAM_EnumFormat, SPA_TYPE_INFO_PARAM_ID_BASE "EnumFormat", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Format, SPA_TYPE_INFO_PARAM_ID_BASE "Format", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Buffers, SPA_TYPE_INFO_PARAM_ID_BASE "Buffers", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Meta, SPA_TYPE_INFO_PARAM_ID_BASE "Meta", SPA_TYPE_Int, NULL }, + { SPA_PARAM_IO, SPA_TYPE_INFO_PARAM_ID_BASE "IO", SPA_TYPE_Int, NULL }, + { SPA_PARAM_Profile, SPA_TYPE_INFO_PARAM_ID_BASE "Profile", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; /* base for parameter objects */ -#define SPA_TYPE__Param SPA_TYPE_OBJECT_BASE "Param" -#define SPA_TYPE_PARAM_BASE SPA_TYPE__Param ":" +#define SPA_TYPE_INFO_Param SPA_TYPE_INFO_OBJECT_BASE "Param" +#define SPA_TYPE_INFO_PARAM_BASE SPA_TYPE_INFO_Param ":" /* object with supported parameter id */ -#define SPA_TYPE_PARAM__List SPA_TYPE_PARAM_BASE "List" -#define SPA_TYPE_PARAM_LIST_BASE SPA_TYPE_PARAM__List ":" +#define SPA_TYPE_INFO_PARAM_List SPA_TYPE_INFO_PARAM_BASE "List" +#define SPA_TYPE_INFO_PARAM_LIST_BASE SPA_TYPE_INFO_PARAM_List ":" static const struct spa_type_info spa_type_param_list[] = { - { SPA_PARAM_LIST_START, SPA_TYPE_PARAM_LIST_BASE, SPA_TYPE_Id, spa_type_param }, - { SPA_PARAM_LIST_id, SPA_TYPE_PARAM_LIST_BASE "id", SPA_TYPE_Id, spa_type_param }, + { SPA_PARAM_LIST_START, SPA_TYPE_INFO_PARAM_LIST_BASE, SPA_TYPE_Id, spa_type_param }, + { SPA_PARAM_LIST_id, SPA_TYPE_INFO_PARAM_LIST_BASE "id", SPA_TYPE_Id, spa_type_param }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__Props SPA_TYPE_PARAM_BASE "Props" -#define SPA_TYPE_PROPS_BASE SPA_TYPE__Props ":" +#define SPA_TYPE_INFO_Props SPA_TYPE_INFO_PARAM_BASE "Props" +#define SPA_TYPE_INFO_PROPS_BASE SPA_TYPE_INFO_Props ":" static const struct spa_type_info spa_type_props[] = { - { SPA_PROP_START, SPA_TYPE_PROPS_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_PROP_unknown, SPA_TYPE_PROPS_BASE "unknown", SPA_TYPE_None, NULL }, - { SPA_PROP_device, SPA_TYPE_PROPS_BASE "device", SPA_TYPE_String, NULL }, - { SPA_PROP_deviceName, SPA_TYPE_PROPS_BASE "deviceName", SPA_TYPE_String, NULL }, - { SPA_PROP_deviceFd, SPA_TYPE_PROPS_BASE "deviceFd", SPA_TYPE_Fd, NULL }, - { SPA_PROP_card, SPA_TYPE_PROPS_BASE "card", SPA_TYPE_String, NULL }, - { SPA_PROP_cardName, SPA_TYPE_PROPS_BASE "cardName", SPA_TYPE_String, NULL }, - { SPA_PROP_minLatency, SPA_TYPE_PROPS_BASE "minLatency", SPA_TYPE_Int, NULL }, - { SPA_PROP_maxLatency, SPA_TYPE_PROPS_BASE "maxLatency", SPA_TYPE_Int, NULL }, - { SPA_PROP_periods, SPA_TYPE_PROPS_BASE "periods", SPA_TYPE_Int, NULL }, - { SPA_PROP_periodSize, SPA_TYPE_PROPS_BASE "periodSize", SPA_TYPE_Int, NULL }, - { SPA_PROP_periodEvent, SPA_TYPE_PROPS_BASE "periodEvent", SPA_TYPE_Bool, NULL }, - { SPA_PROP_live, SPA_TYPE_PROPS_BASE "live", SPA_TYPE_Bool, NULL }, - { SPA_PROP_rate, SPA_TYPE_PROPS_BASE "rate", SPA_TYPE_Double, NULL }, + { SPA_PROP_START, SPA_TYPE_INFO_PROPS_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_PROP_unknown, SPA_TYPE_INFO_PROPS_BASE "unknown", SPA_TYPE_None, NULL }, + { SPA_PROP_device, SPA_TYPE_INFO_PROPS_BASE "device", SPA_TYPE_String, NULL }, + { SPA_PROP_deviceName, SPA_TYPE_INFO_PROPS_BASE "deviceName", SPA_TYPE_String, NULL }, + { SPA_PROP_deviceFd, SPA_TYPE_INFO_PROPS_BASE "deviceFd", SPA_TYPE_Fd, NULL }, + { SPA_PROP_card, SPA_TYPE_INFO_PROPS_BASE "card", SPA_TYPE_String, NULL }, + { SPA_PROP_cardName, SPA_TYPE_INFO_PROPS_BASE "cardName", SPA_TYPE_String, NULL }, + { SPA_PROP_minLatency, SPA_TYPE_INFO_PROPS_BASE "minLatency", SPA_TYPE_Int, NULL }, + { SPA_PROP_maxLatency, SPA_TYPE_INFO_PROPS_BASE "maxLatency", SPA_TYPE_Int, NULL }, + { SPA_PROP_periods, SPA_TYPE_INFO_PROPS_BASE "periods", SPA_TYPE_Int, NULL }, + { SPA_PROP_periodSize, SPA_TYPE_INFO_PROPS_BASE "periodSize", SPA_TYPE_Int, NULL }, + { SPA_PROP_periodEvent, SPA_TYPE_INFO_PROPS_BASE "periodEvent", SPA_TYPE_Bool, NULL }, + { SPA_PROP_live, SPA_TYPE_INFO_PROPS_BASE "live", SPA_TYPE_Bool, NULL }, + { SPA_PROP_rate, SPA_TYPE_INFO_PROPS_BASE "rate", SPA_TYPE_Double, NULL }, - { SPA_PROP_waveType, SPA_TYPE_PROPS_BASE "waveType", SPA_TYPE_Id, NULL }, - { SPA_PROP_frequency, SPA_TYPE_PROPS_BASE "frequency", SPA_TYPE_Int, NULL }, - { SPA_PROP_volume, SPA_TYPE_PROPS_BASE "volume", SPA_TYPE_Float, NULL }, - { SPA_PROP_mute, SPA_TYPE_PROPS_BASE "mute", SPA_TYPE_Bool, NULL }, - { SPA_PROP_patternType, SPA_TYPE_PROPS_BASE "patternType", SPA_TYPE_Id, NULL }, - { SPA_PROP_ditherType, SPA_TYPE_PROPS_BASE "ditherType", SPA_TYPE_Id, NULL }, - { SPA_PROP_truncate, SPA_TYPE_PROPS_BASE "truncate", SPA_TYPE_Bool, NULL }, + { SPA_PROP_waveType, SPA_TYPE_INFO_PROPS_BASE "waveType", SPA_TYPE_Id, NULL }, + { SPA_PROP_frequency, SPA_TYPE_INFO_PROPS_BASE "frequency", SPA_TYPE_Int, NULL }, + { SPA_PROP_volume, SPA_TYPE_INFO_PROPS_BASE "volume", SPA_TYPE_Float, NULL }, + { SPA_PROP_mute, SPA_TYPE_INFO_PROPS_BASE "mute", SPA_TYPE_Bool, NULL }, + { SPA_PROP_patternType, SPA_TYPE_INFO_PROPS_BASE "patternType", SPA_TYPE_Id, NULL }, + { SPA_PROP_ditherType, SPA_TYPE_INFO_PROPS_BASE "ditherType", SPA_TYPE_Id, NULL }, + { SPA_PROP_truncate, SPA_TYPE_INFO_PROPS_BASE "truncate", SPA_TYPE_Bool, NULL }, - { SPA_PROP_brightness, SPA_TYPE_PROPS_BASE "brightness", SPA_TYPE_Int, NULL }, - { SPA_PROP_contrast, SPA_TYPE_PROPS_BASE "contrast", SPA_TYPE_Int, NULL }, - { SPA_PROP_saturation, SPA_TYPE_PROPS_BASE "saturation", SPA_TYPE_Int, NULL }, - { SPA_PROP_hue, SPA_TYPE_PROPS_BASE "hue", SPA_TYPE_Int, NULL }, - { SPA_PROP_gamma, SPA_TYPE_PROPS_BASE "gamma", SPA_TYPE_Int, NULL }, - { SPA_PROP_exposure, SPA_TYPE_PROPS_BASE "exposure", SPA_TYPE_Int, NULL }, - { SPA_PROP_gain, SPA_TYPE_PROPS_BASE "gain", SPA_TYPE_Int, NULL }, - { SPA_PROP_sharpness, SPA_TYPE_PROPS_BASE "sharpness", SPA_TYPE_Int, NULL }, + { SPA_PROP_brightness, SPA_TYPE_INFO_PROPS_BASE "brightness", SPA_TYPE_Int, NULL }, + { SPA_PROP_contrast, SPA_TYPE_INFO_PROPS_BASE "contrast", SPA_TYPE_Int, NULL }, + { SPA_PROP_saturation, SPA_TYPE_INFO_PROPS_BASE "saturation", SPA_TYPE_Int, NULL }, + { SPA_PROP_hue, SPA_TYPE_INFO_PROPS_BASE "hue", SPA_TYPE_Int, NULL }, + { SPA_PROP_gamma, SPA_TYPE_INFO_PROPS_BASE "gamma", SPA_TYPE_Int, NULL }, + { SPA_PROP_exposure, SPA_TYPE_INFO_PROPS_BASE "exposure", SPA_TYPE_Int, NULL }, + { SPA_PROP_gain, SPA_TYPE_INFO_PROPS_BASE "gain", SPA_TYPE_Int, NULL }, + { SPA_PROP_sharpness, SPA_TYPE_INFO_PROPS_BASE "sharpness", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; /** Enum Property info */ -#define SPA_TYPE__PropInfo SPA_TYPE_PARAM_BASE "PropInfo" -#define SPA_TYPE_PROP_INFO_BASE SPA_TYPE__PropInfo ":" +#define SPA_TYPE_INFO_PropInfo SPA_TYPE_INFO_PARAM_BASE "PropInfo" +#define SPA_TYPE_INFO_PROP_INFO_BASE SPA_TYPE_INFO_PropInfo ":" static const struct spa_type_info spa_type_prop_info[] = { - { SPA_PROP_INFO_START, SPA_TYPE_PROP_INFO_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_PROP_INFO_id, SPA_TYPE_PROP_INFO_BASE "id", SPA_TYPE_Id, spa_type_props }, - { SPA_PROP_INFO_name, SPA_TYPE_PROP_INFO_BASE "name", SPA_TYPE_String, NULL }, - { SPA_PROP_INFO_type, SPA_TYPE_PROP_INFO_BASE "type", SPA_TYPE_Pod, NULL }, - { SPA_PROP_INFO_labels, SPA_TYPE_PROP_INFO_BASE "labels", SPA_TYPE_Struct, NULL }, + { SPA_PROP_INFO_START, SPA_TYPE_INFO_PROP_INFO_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_PROP_INFO_id, SPA_TYPE_INFO_PROP_INFO_BASE "id", SPA_TYPE_Id, spa_type_props }, + { SPA_PROP_INFO_name, SPA_TYPE_INFO_PROP_INFO_BASE "name", SPA_TYPE_String, NULL }, + { SPA_PROP_INFO_type, SPA_TYPE_INFO_PROP_INFO_BASE "type", SPA_TYPE_Pod, NULL }, + { SPA_PROP_INFO_labels, SPA_TYPE_INFO_PROP_INFO_BASE "labels", SPA_TYPE_Struct, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE_PARAM__Meta SPA_TYPE_PARAM_BASE "Meta" -#define SPA_TYPE_PARAM_META_BASE SPA_TYPE_PARAM__Meta ":" +#define SPA_TYPE_INFO_PARAM_Meta SPA_TYPE_INFO_PARAM_BASE "Meta" +#define SPA_TYPE_INFO_PARAM_META_BASE SPA_TYPE_INFO_PARAM_Meta ":" static const struct spa_type_info spa_type_param_meta[] = { - { SPA_PARAM_META_START, SPA_TYPE_PARAM_META_BASE, SPA_TYPE_Id, spa_type_param }, - { SPA_PARAM_META_type, SPA_TYPE_PARAM_META_BASE "type", SPA_TYPE_Id, spa_type_meta_type }, - { SPA_PARAM_META_size, SPA_TYPE_PARAM_META_BASE "size", SPA_TYPE_Int, NULL }, + { SPA_PARAM_META_START, SPA_TYPE_INFO_PARAM_META_BASE, SPA_TYPE_Id, spa_type_param }, + { SPA_PARAM_META_type, SPA_TYPE_INFO_PARAM_META_BASE "type", SPA_TYPE_Id, spa_type_meta_type }, + { SPA_PARAM_META_size, SPA_TYPE_INFO_PARAM_META_BASE "size", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; /** Base for parameters that describe IO areas to exchange data, * control and properties with a node. */ -#define SPA_TYPE_PARAM__IO SPA_TYPE_PARAM_BASE "IO" -#define SPA_TYPE_PARAM_IO_BASE SPA_TYPE_PARAM__IO ":" +#define SPA_TYPE_INFO_PARAM_IO SPA_TYPE_INFO_PARAM_BASE "IO" +#define SPA_TYPE_INFO_PARAM_IO_BASE SPA_TYPE_INFO_PARAM_IO ":" static const struct spa_type_info spa_type_param_io[] = { - { SPA_PARAM_IO_START, SPA_TYPE_PARAM_IO_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_PARAM_IO_id, SPA_TYPE_PARAM_IO_BASE "id", SPA_TYPE_Id, spa_type_io }, - { SPA_PARAM_IO_size, SPA_TYPE_PARAM_IO_BASE "size", SPA_TYPE_Int, NULL }, + { SPA_PARAM_IO_START, SPA_TYPE_INFO_PARAM_IO_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_PARAM_IO_id, SPA_TYPE_INFO_PARAM_IO_BASE "id", SPA_TYPE_Id, spa_type_io }, + { SPA_PARAM_IO_size, SPA_TYPE_INFO_PARAM_IO_BASE "size", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__Format SPA_TYPE_PARAM_BASE "Format" -#define SPA_TYPE_FORMAT_BASE SPA_TYPE__Format ":" +#define SPA_TYPE_INFO_Format SPA_TYPE_INFO_PARAM_BASE "Format" +#define SPA_TYPE_INFO_FORMAT_BASE SPA_TYPE_INFO_Format ":" -#define SPA_TYPE__MediaType SPA_TYPE_ENUM_BASE "MediaType" -#define SPA_TYPE_MEDIA_TYPE_BASE SPA_TYPE__MediaType ":" +#define SPA_TYPE_INFO_MediaType SPA_TYPE_INFO_ENUM_BASE "MediaType" +#define SPA_TYPE_INFO_MEDIA_TYPE_BASE SPA_TYPE_INFO_MediaType ":" #include #include static const struct spa_type_info spa_type_media_type[] = { - { SPA_MEDIA_TYPE_unknown, SPA_TYPE_MEDIA_TYPE_BASE "unknown", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_TYPE_audio, SPA_TYPE_MEDIA_TYPE_BASE "audio", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_TYPE_video, SPA_TYPE_MEDIA_TYPE_BASE "video", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_TYPE_image, SPA_TYPE_MEDIA_TYPE_BASE "image", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_TYPE_binary, SPA_TYPE_MEDIA_TYPE_BASE "binary", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_TYPE_stream, SPA_TYPE_MEDIA_TYPE_BASE "stream", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_unknown, SPA_TYPE_INFO_MEDIA_TYPE_BASE "unknown", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_audio, SPA_TYPE_INFO_MEDIA_TYPE_BASE "audio", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_video, SPA_TYPE_INFO_MEDIA_TYPE_BASE "video", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_image, SPA_TYPE_INFO_MEDIA_TYPE_BASE "image", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_binary, SPA_TYPE_INFO_MEDIA_TYPE_BASE "binary", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_TYPE_stream, SPA_TYPE_INFO_MEDIA_TYPE_BASE "stream", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__MediaSubtype SPA_TYPE_ENUM_BASE "MediaSubtype" -#define SPA_TYPE_MEDIA_SUBTYPE_BASE SPA_TYPE__MediaSubtype ":" +#define SPA_TYPE_INFO_MediaSubtype SPA_TYPE_INFO_ENUM_BASE "MediaSubtype" +#define SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE SPA_TYPE_INFO_MediaSubtype ":" static const struct spa_type_info spa_type_media_subtype[] = { - { SPA_MEDIA_SUBTYPE_unknown, SPA_TYPE_MEDIA_SUBTYPE_BASE "unknown", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_unknown, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "unknown", SPA_TYPE_Int, NULL }, /* generic subtypes */ - { SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_MEDIA_SUBTYPE_BASE "raw", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "raw", SPA_TYPE_Int, NULL }, /* audio subtypes */ - { SPA_MEDIA_SUBTYPE_mp3, SPA_TYPE_MEDIA_SUBTYPE_BASE "mp3", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_aac, SPA_TYPE_MEDIA_SUBTYPE_BASE "aac", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_vorbis, SPA_TYPE_MEDIA_SUBTYPE_BASE "vorbis", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_wma, SPA_TYPE_MEDIA_SUBTYPE_BASE "wma", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_ra, SPA_TYPE_MEDIA_SUBTYPE_BASE "ra", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_sbc, SPA_TYPE_MEDIA_SUBTYPE_BASE "sbc", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_adpcm, SPA_TYPE_MEDIA_SUBTYPE_BASE "adpcm", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_g723, SPA_TYPE_MEDIA_SUBTYPE_BASE "g723", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_g726, SPA_TYPE_MEDIA_SUBTYPE_BASE "g726", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_g729, SPA_TYPE_MEDIA_SUBTYPE_BASE "g729", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_amr, SPA_TYPE_MEDIA_SUBTYPE_BASE "amr", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_gsm, SPA_TYPE_MEDIA_SUBTYPE_BASE "gsm", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mp3, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mp3", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_aac, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "aac", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_vorbis, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vorbis", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_wma, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "wma", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_ra, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "ra", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_sbc, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "sbc", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_adpcm, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "adpcm", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_g723, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "g723", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_g726, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "g726", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_g729, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "g729", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_amr, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "amr", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_gsm, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "gsm", SPA_TYPE_Int, NULL }, /* video subtypes */ - { SPA_MEDIA_SUBTYPE_h264, SPA_TYPE_MEDIA_SUBTYPE_BASE "h264", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_mjpg, SPA_TYPE_MEDIA_SUBTYPE_BASE "mjpg", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_dv, SPA_TYPE_MEDIA_SUBTYPE_BASE "dv", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_mpegts, SPA_TYPE_MEDIA_SUBTYPE_BASE "mpegts", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_h263, SPA_TYPE_MEDIA_SUBTYPE_BASE "h263", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_mpeg1, SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg1", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_mpeg2, SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg2", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_mpeg4, SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg4", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_xvid, SPA_TYPE_MEDIA_SUBTYPE_BASE "xvid", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_vc1, SPA_TYPE_MEDIA_SUBTYPE_BASE "vc1", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_vp8, SPA_TYPE_MEDIA_SUBTYPE_BASE "vp8", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_vp9, SPA_TYPE_MEDIA_SUBTYPE_BASE "vp9", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_MEDIA_SUBTYPE_BASE "jpeg", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_bayer, SPA_TYPE_MEDIA_SUBTYPE_BASE "bayer", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_h264, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "h264", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mjpg, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mjpg", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_dv, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "dv", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mpegts, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mpegts", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_h263, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "h263", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mpeg1, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mpeg1", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mpeg2, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mpeg2", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_mpeg4, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mpeg4", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_xvid, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "xvid", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_vc1, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vc1", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_vp8, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp8", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_vp9, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp9", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_bayer, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "bayer", SPA_TYPE_Int, NULL }, - { SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_MEDIA_SUBTYPE_BASE "midi", SPA_TYPE_Int, NULL }, + { SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "midi", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE__FormatAudio SPA_TYPE_FORMAT_BASE "Audio" -#define SPA_TYPE_FORMAT_AUDIO_BASE SPA_TYPE__FormatAudio ":" +#define SPA_TYPE_INFO_FormatAudio SPA_TYPE_INFO_FORMAT_BASE "Audio" +#define SPA_TYPE_INFO_FORMAT_AUDIO_BASE SPA_TYPE_INFO_FormatAudio ":" -#define SPA_TYPE__FormatVideo SPA_TYPE_FORMAT_BASE "Video" -#define SPA_TYPE_FORMAT_VIDEO_BASE SPA_TYPE__FormatVideo ":" +#define SPA_TYPE_INFO_FormatVideo SPA_TYPE_INFO_FORMAT_BASE "Video" +#define SPA_TYPE_INFO_FORMAT_VIDEO_BASE SPA_TYPE_INFO_FormatVideo ":" static const struct spa_type_info spa_type_format[] = { - { SPA_FORMAT_START, SPA_TYPE_FORMAT_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_FORMAT_START, SPA_TYPE_INFO_FORMAT_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_FORMAT_mediaType, SPA_TYPE_FORMAT_BASE "mediaType", SPA_TYPE_Id, + { SPA_FORMAT_mediaType, SPA_TYPE_INFO_FORMAT_BASE "mediaType", SPA_TYPE_Id, spa_type_media_type, }, - { SPA_FORMAT_mediaSubtype, SPA_TYPE_FORMAT_BASE "mediaSubtype", SPA_TYPE_Id, + { SPA_FORMAT_mediaSubtype, SPA_TYPE_INFO_FORMAT_BASE "mediaSubtype", SPA_TYPE_Id, spa_type_media_subtype, }, - { SPA_FORMAT_AUDIO_format, SPA_TYPE_FORMAT_AUDIO_BASE "format", SPA_TYPE_Id, + { SPA_FORMAT_AUDIO_format, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "format", SPA_TYPE_Id, spa_type_audio_format }, - { SPA_FORMAT_AUDIO_flags, SPA_TYPE_FORMAT_AUDIO_BASE "flags", SPA_TYPE_Id, + { SPA_FORMAT_AUDIO_flags, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "flags", SPA_TYPE_Id, spa_type_audio_flags }, - { SPA_FORMAT_AUDIO_rate, SPA_TYPE_FORMAT_AUDIO_BASE "rate", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_AUDIO_channels, SPA_TYPE_FORMAT_AUDIO_BASE "channels", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_AUDIO_position, SPA_TYPE_FORMAT_AUDIO_BASE "position", SPA_TYPE_Id, spa_type_audio_channel }, + { SPA_FORMAT_AUDIO_rate, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "rate", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_AUDIO_channels, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "channels", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_AUDIO_position, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "position", SPA_TYPE_Id, spa_type_audio_channel }, - { SPA_FORMAT_VIDEO_format, SPA_TYPE_FORMAT_VIDEO_BASE "format", SPA_TYPE_Id, + { SPA_FORMAT_VIDEO_format, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "format", SPA_TYPE_Id, spa_type_video_format, }, - { SPA_FORMAT_VIDEO_size, SPA_TYPE_FORMAT_VIDEO_BASE "size", SPA_TYPE_Rectangle, NULL }, - { SPA_FORMAT_VIDEO_framerate, SPA_TYPE_FORMAT_VIDEO_BASE "framerate", SPA_TYPE_Fraction, NULL }, - { SPA_FORMAT_VIDEO_maxFramerate, SPA_TYPE_FORMAT_VIDEO_BASE "maxFramerate", SPA_TYPE_Fraction, NULL }, - { SPA_FORMAT_VIDEO_views, SPA_TYPE_FORMAT_VIDEO_BASE "views", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_interlaceMode, SPA_TYPE_FORMAT_VIDEO_BASE "interlaceMode", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_pixelAspectRatio, SPA_TYPE_FORMAT_VIDEO_BASE "pixelAspectRatio", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_multiviewMode, SPA_TYPE_FORMAT_VIDEO_BASE "multiviewMode", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_multiviewFlags, SPA_TYPE_FORMAT_VIDEO_BASE "multiviewFlags", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_chromaSite, SPA_TYPE_FORMAT_VIDEO_BASE "chromaSite", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_colorRange, SPA_TYPE_FORMAT_VIDEO_BASE "colorRange", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_colorMatrix, SPA_TYPE_FORMAT_VIDEO_BASE "colorMatrix", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_transferFunction, SPA_TYPE_FORMAT_VIDEO_BASE "transferFunction", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_colorPrimaries, SPA_TYPE_FORMAT_VIDEO_BASE "colorPrimaries", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_profile, SPA_TYPE_FORMAT_VIDEO_BASE "profile", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_level, SPA_TYPE_FORMAT_VIDEO_BASE "level", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_streamFormat, SPA_TYPE_FORMAT_VIDEO_BASE "streamFormat", SPA_TYPE_Int, NULL }, - { SPA_FORMAT_VIDEO_alignment, SPA_TYPE_FORMAT_VIDEO_BASE "alignment", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_VIDEO_size, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "size", SPA_TYPE_Rectangle, NULL }, + { SPA_FORMAT_VIDEO_framerate, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "framerate", SPA_TYPE_Fraction, NULL }, + { SPA_FORMAT_VIDEO_maxFramerate, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "maxFramerate", SPA_TYPE_Fraction, NULL }, + { SPA_FORMAT_VIDEO_views, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "views", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_VIDEO_interlaceMode, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "interlaceMode", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_pixelAspectRatio, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "pixelAspectRatio", SPA_TYPE_Fraction, NULL }, + { SPA_FORMAT_VIDEO_multiviewMode, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "multiviewMode", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_multiviewFlags, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "multiviewFlags", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_chromaSite, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "chromaSite", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_colorRange, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "colorRange", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_colorMatrix, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "colorMatrix", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_transferFunction, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "transferFunction", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_colorPrimaries, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "colorPrimaries", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_profile, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "profile", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_VIDEO_level, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "level", SPA_TYPE_Int, NULL }, + { SPA_FORMAT_VIDEO_streamFormat, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "streamFormat", SPA_TYPE_Id, NULL }, + { SPA_FORMAT_VIDEO_alignment, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "alignment", SPA_TYPE_Id, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE_PARAM__Buffers SPA_TYPE_PARAM_BASE "Buffers" -#define SPA_TYPE_PARAM_BUFFERS_BASE SPA_TYPE_PARAM__Buffers ":" +#define SPA_TYPE_INFO_PARAM_Buffers SPA_TYPE_INFO_PARAM_BASE "Buffers" +#define SPA_TYPE_INFO_PARAM_BUFFERS_BASE SPA_TYPE_INFO_PARAM_Buffers ":" -#define SPA_TYPE_PARAM__BlockInfo SPA_TYPE_PARAM_BUFFERS_BASE "BlockInfo" -#define SPA_TYPE_PARAM_BLOCK_INFO_BASE SPA_TYPE_PARAM__BlockInfo ":" +#define SPA_TYPE_INFO_PARAM_BlockInfo SPA_TYPE_INFO_PARAM_BUFFERS_BASE "BlockInfo" +#define SPA_TYPE_INFO_PARAM_BLOCK_INFO_BASE SPA_TYPE_INFO_PARAM_BlockInfo ":" static const struct spa_type_info spa_type_param_buffers[] = { - { SPA_PARAM_BUFFERS_START, SPA_TYPE_PARAM_BUFFERS_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_PARAM_BUFFERS_buffers, SPA_TYPE_PARAM_BUFFERS_BASE "buffers", SPA_TYPE_Int, NULL }, - { SPA_PARAM_BUFFERS_blocks, SPA_TYPE_PARAM_BUFFERS_BASE "blocks", SPA_TYPE_Int, NULL }, - { SPA_PARAM_BUFFERS_size, SPA_TYPE_PARAM_BLOCK_INFO_BASE "size", SPA_TYPE_Int, NULL }, - { SPA_PARAM_BUFFERS_stride, SPA_TYPE_PARAM_BLOCK_INFO_BASE "stride", SPA_TYPE_Int, NULL }, - { SPA_PARAM_BUFFERS_align, SPA_TYPE_PARAM_BLOCK_INFO_BASE "align", SPA_TYPE_Int, NULL }, + { SPA_PARAM_BUFFERS_START, SPA_TYPE_INFO_PARAM_BUFFERS_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_PARAM_BUFFERS_buffers, SPA_TYPE_INFO_PARAM_BUFFERS_BASE "buffers", SPA_TYPE_Int, NULL }, + { SPA_PARAM_BUFFERS_blocks, SPA_TYPE_INFO_PARAM_BUFFERS_BASE "blocks", SPA_TYPE_Int, NULL }, + { SPA_PARAM_BUFFERS_size, SPA_TYPE_INFO_PARAM_BLOCK_INFO_BASE "size", SPA_TYPE_Int, NULL }, + { SPA_PARAM_BUFFERS_stride, SPA_TYPE_INFO_PARAM_BLOCK_INFO_BASE "stride", SPA_TYPE_Int, NULL }, + { SPA_PARAM_BUFFERS_align, SPA_TYPE_INFO_PARAM_BLOCK_INFO_BASE "align", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; -#define SPA_TYPE_PARAM__Profile SPA_TYPE_PARAM_BASE "Profile" -#define SPA_TYPE_PARAM_PROFILE_BASE SPA_TYPE_PARAM__Profile ":" +#define SPA_TYPE_INFO_PARAM_Profile SPA_TYPE_INFO_PARAM_BASE "Profile" +#define SPA_TYPE_INFO_PARAM_PROFILE_BASE SPA_TYPE_INFO_PARAM_Profile ":" static const struct spa_type_info spa_type_param_profile[] = { - { SPA_PARAM_PROFILE_START, SPA_TYPE_PARAM_PROFILE_BASE, SPA_TYPE_Id, spa_type_param, }, - { SPA_PARAM_PROFILE_id, SPA_TYPE_PARAM_PROFILE_BASE "id", SPA_TYPE_Int, NULL }, - { SPA_PARAM_PROFILE_name, SPA_TYPE_PARAM_PROFILE_BASE "name", SPA_TYPE_String, NULL }, - { SPA_PARAM_PROFILE_direction, SPA_TYPE_PARAM_PROFILE_BASE "direction", SPA_TYPE_Id, spa_type_direction }, - { SPA_PARAM_PROFILE_format, SPA_TYPE_PARAM_PROFILE_BASE "format", SPA_TYPE_Object, NULL, }, + { SPA_PARAM_PROFILE_START, SPA_TYPE_INFO_PARAM_PROFILE_BASE, SPA_TYPE_Id, spa_type_param, }, + { SPA_PARAM_PROFILE_id, SPA_TYPE_INFO_PARAM_PROFILE_BASE "id", SPA_TYPE_Int, NULL }, + { SPA_PARAM_PROFILE_name, SPA_TYPE_INFO_PARAM_PROFILE_BASE "name", SPA_TYPE_String, NULL }, + { SPA_PARAM_PROFILE_direction, SPA_TYPE_INFO_PARAM_PROFILE_BASE "direction", SPA_TYPE_Id, spa_type_direction }, + { SPA_PARAM_PROFILE_format, SPA_TYPE_INFO_PARAM_PROFILE_BASE "format", SPA_TYPE_Object, NULL, }, { 0, NULL, 0, NULL }, }; @@ -276,4 +276,4 @@ static const struct spa_type_info spa_type_param_profile[] = { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_TYPES_H__ */ +#endif /* SPA_PARAM_TYPES_H */ diff --git a/spa/include/spa/param/video/chroma.h b/spa/include/spa/param/video/chroma.h index 17eb2dffe..02eed57ad 100644 --- a/spa/include/spa/param/video/chroma.h +++ b/spa/include/spa/param/video/chroma.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_CHROMA_H__ -#define __SPA_VIDEO_CHROMA_H__ +#ifndef SPA_VIDEO_CHROMA_H +#define SPA_VIDEO_CHROMA_H #ifdef __cplusplus extern "C" { @@ -57,4 +57,4 @@ enum spa_video_chroma_site { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_CHROMA_H__ */ +#endif /* SPA_VIDEO_CHROMA_H */ diff --git a/spa/include/spa/param/video/color.h b/spa/include/spa/param/video/color.h index b550b44b0..7de8c3672 100644 --- a/spa/include/spa/param/video/color.h +++ b/spa/include/spa/param/video/color.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_COLOR_H__ -#define __SPA_VIDEO_COLOR_H__ +#ifndef SPA_VIDEO_COLOR_H +#define SPA_VIDEO_COLOR_H #ifdef __cplusplus extern "C" { @@ -159,4 +159,4 @@ struct spa_video_colorimetry { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_COLOR_H__ */ +#endif /* SPA_VIDEO_COLOR_H */ diff --git a/spa/include/spa/param/video/encoded.h b/spa/include/spa/param/video/encoded.h index 529a9a822..5eb984447 100644 --- a/spa/include/spa/param/video/encoded.h +++ b/spa/include/spa/param/video/encoded.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_ENCODED_H__ -#define __SPA_VIDEO_ENCODED_H__ +#ifndef SPA_VIDEO_ENCODED_H +#define SPA_VIDEO_ENCODED_H #ifdef __cplusplus extern "C" { @@ -62,4 +62,4 @@ struct spa_video_info_mjpg { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_ENCODED_H__ */ +#endif /* SPA_VIDEO_ENCODED_H */ diff --git a/spa/include/spa/param/video/format-utils.h b/spa/include/spa/param/video/format-utils.h index 5235d0a22..1dbccc912 100644 --- a/spa/include/spa/param/video/format-utils.h +++ b/spa/include/spa/param/video/format-utils.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_VIDEO_FORMAT_UTILS_H__ -#define __SPA_PARAM_VIDEO_FORMAT_UTILS_H__ +#ifndef SPA_PARAM_VIDEO_FORMAT_UTILS_H +#define SPA_PARAM_VIDEO_FORMAT_UTILS_H #ifdef __cplusplus extern "C" { @@ -101,4 +101,4 @@ spa_format_video_mjpg_parse(const struct spa_pod *format, } /* extern "C" */ #endif -#endif /* __SPA_PARAM_VIDEO_FORMAT_UTILS */ +#endif /* SPA_PARAM_VIDEO_FORMAT_UTILS_H */ diff --git a/spa/include/spa/param/video/format.h b/spa/include/spa/param/video/format.h index 0a4b1036c..0837b63fe 100644 --- a/spa/include/spa/param/video/format.h +++ b/spa/include/spa/param/video/format.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PARAM_VIDEO_FORMAT_H__ -#define __SPA_PARAM_VIDEO_FORMAT_H__ +#ifndef SPA_PARAM_VIDEO_FORMAT_H +#define SPA_PARAM_VIDEO_FORMAT_H #ifdef __cplusplus extern "C" { @@ -46,4 +46,4 @@ struct spa_video_info { } /* extern "C" */ #endif -#endif /* __SPA_PARAM_VIDEO_FORMAT */ +#endif /* SPA_PARAM_VIDEO_FORMAT_H */ diff --git a/spa/include/spa/param/video/multiview.h b/spa/include/spa/param/video/multiview.h index 1aa0c229e..97b24ba55 100644 --- a/spa/include/spa/param/video/multiview.h +++ b/spa/include/spa/param/video/multiview.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_MULTIVIEW_H__ -#define __SPA_VIDEO_MULTIVIEW_H__ +#ifndef SPA_VIDEO_MULTIVIEW_H +#define SPA_VIDEO_MULTIVIEW_H #ifdef __cplusplus extern "C" { @@ -137,4 +137,4 @@ enum spa_video_multiview_flags { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_MULTIVIEW_H__ */ +#endif /* SPA_VIDEO_MULTIVIEW_H */ diff --git a/spa/include/spa/param/video/raw.h b/spa/include/spa/param/video/raw.h index 9faee19ac..096737df9 100644 --- a/spa/include/spa/param/video/raw.h +++ b/spa/include/spa/param/video/raw.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_RAW_H__ -#define __SPA_VIDEO_RAW_H__ +#ifndef SPA_VIDEO_RAW_H +#define SPA_VIDEO_RAW_H #ifdef __cplusplus extern "C" { @@ -202,4 +202,4 @@ struct spa_video_info_raw { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_RAW_H__ */ +#endif /* SPA_VIDEO_RAW_H */ diff --git a/spa/include/spa/param/video/type-info.h b/spa/include/spa/param/video/type-info.h index c4bec7882..ecbc6965d 100644 --- a/spa/include/spa/param/video/type-info.h +++ b/spa/include/spa/param/video/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_VIDEO_TYPES_H__ -#define __SPA_VIDEO_TYPES_H__ +#ifndef SPA_VIDEO_TYPES_H +#define SPA_VIDEO_TYPES_H #ifdef __cplusplus extern "C" { @@ -31,87 +31,87 @@ extern "C" { #include -#define SPA_TYPE__VideoFormat SPA_TYPE_ENUM_BASE "VideoFormat" -#define SPA_TYPE_VIDEO_FORMAT_BASE SPA_TYPE__VideoFormat ":" +#define SPA_TYPE_INFO_VideoFormat SPA_TYPE_INFO_ENUM_BASE "VideoFormat" +#define SPA_TYPE_INFO_VIDEO_FORMAT_BASE SPA_TYPE_INFO_VideoFormat ":" static const struct spa_type_info spa_type_video_format[] = { - { SPA_VIDEO_FORMAT_ENCODED, SPA_TYPE_VIDEO_FORMAT_BASE "encoded", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I420, SPA_TYPE_VIDEO_FORMAT_BASE "I420", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_YV12, SPA_TYPE_VIDEO_FORMAT_BASE "YV12", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_YUY2, SPA_TYPE_VIDEO_FORMAT_BASE "YUY2", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_UYVY, SPA_TYPE_VIDEO_FORMAT_BASE "UYVY", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_AYUV, SPA_TYPE_VIDEO_FORMAT_BASE "AYUV", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGBx, SPA_TYPE_VIDEO_FORMAT_BASE "RGBx", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_BGRx, SPA_TYPE_VIDEO_FORMAT_BASE "BGRx", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_xRGB, SPA_TYPE_VIDEO_FORMAT_BASE "xRGB", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_xBGR, SPA_TYPE_VIDEO_FORMAT_BASE "xBGR", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGBA, SPA_TYPE_VIDEO_FORMAT_BASE "RGBA", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_BGRA, SPA_TYPE_VIDEO_FORMAT_BASE "BGRA", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_ARGB, SPA_TYPE_VIDEO_FORMAT_BASE "ARGB", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_ABGR, SPA_TYPE_VIDEO_FORMAT_BASE "ABGR", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGB, SPA_TYPE_VIDEO_FORMAT_BASE "RGB", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_BGR, SPA_TYPE_VIDEO_FORMAT_BASE "BGR", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y41B, SPA_TYPE_VIDEO_FORMAT_BASE "Y41B", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y42B, SPA_TYPE_VIDEO_FORMAT_BASE "Y42B", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_YVYU, SPA_TYPE_VIDEO_FORMAT_BASE "YVYU", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y444, SPA_TYPE_VIDEO_FORMAT_BASE "Y444", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_v210, SPA_TYPE_VIDEO_FORMAT_BASE "v210", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_v216, SPA_TYPE_VIDEO_FORMAT_BASE "v216", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV12, SPA_TYPE_VIDEO_FORMAT_BASE "NV12", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV21, SPA_TYPE_VIDEO_FORMAT_BASE "NV21", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GRAY8, SPA_TYPE_VIDEO_FORMAT_BASE "GRAY8", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GRAY16_BE, SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GRAY16_LE, SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_v308, SPA_TYPE_VIDEO_FORMAT_BASE "v308", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGB16, SPA_TYPE_VIDEO_FORMAT_BASE "RGB16", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_BGR16, SPA_TYPE_VIDEO_FORMAT_BASE "BGR16", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGB15, SPA_TYPE_VIDEO_FORMAT_BASE "RGB15", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_BGR15, SPA_TYPE_VIDEO_FORMAT_BASE "BGR15", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_UYVP, SPA_TYPE_VIDEO_FORMAT_BASE "UYVP", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A420, SPA_TYPE_VIDEO_FORMAT_BASE "A420", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_RGB8P, SPA_TYPE_VIDEO_FORMAT_BASE "RGB8P", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_YUV9, SPA_TYPE_VIDEO_FORMAT_BASE "YUV9", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_YVU9, SPA_TYPE_VIDEO_FORMAT_BASE "YVU9", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_IYU1, SPA_TYPE_VIDEO_FORMAT_BASE "IYU1", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_ARGB64, SPA_TYPE_VIDEO_FORMAT_BASE "ARGB64", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_AYUV64, SPA_TYPE_VIDEO_FORMAT_BASE "AYUV64", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_r210, SPA_TYPE_VIDEO_FORMAT_BASE "r210", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I420_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "I420_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I420_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "I420_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I422_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "I422_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I422_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "I422_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y444_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y444_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBR, SPA_TYPE_VIDEO_FORMAT_BASE "GBR", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBR_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBR_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV16, SPA_TYPE_VIDEO_FORMAT_BASE "NV16", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV24, SPA_TYPE_VIDEO_FORMAT_BASE "NV24", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV12_64Z32, SPA_TYPE_VIDEO_FORMAT_BASE "NV12_64Z32", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A420_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "A420_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A420_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "A420_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A422_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "A422_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A422_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "A422_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A444_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "A444_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_A444_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "A444_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_NV61, SPA_TYPE_VIDEO_FORMAT_BASE "NV61", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_P010_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "P010_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_P010_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "P010_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_IYU2, SPA_TYPE_VIDEO_FORMAT_BASE "IYU2", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_VYUY, SPA_TYPE_VIDEO_FORMAT_BASE "VYUY", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBRA, SPA_TYPE_VIDEO_FORMAT_BASE "GBRA", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBRA_10BE, SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBRA_10LE, SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBR_12BE, SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBR_12LE, SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBRA_12BE, SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_GBRA_12LE, SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I420_12BE, SPA_TYPE_VIDEO_FORMAT_BASE "I420_12BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I420_12LE, SPA_TYPE_VIDEO_FORMAT_BASE "I420_12LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I422_12BE, SPA_TYPE_VIDEO_FORMAT_BASE "I422_12BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_I422_12LE, SPA_TYPE_VIDEO_FORMAT_BASE "I422_12LE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y444_12BE, SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12BE", SPA_TYPE_Int, NULL }, - { SPA_VIDEO_FORMAT_Y444_12LE, SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_ENCODED, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "encoded", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I420, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I420", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_YV12, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "YV12", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_YUY2, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "YUY2", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_UYVY, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "UYVY", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_AYUV, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "AYUV", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGBx, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGBx", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_BGRx, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "BGRx", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_xRGB, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "xRGB", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_xBGR, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "xBGR", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGBA, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGBA", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_BGRA, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "BGRA", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_ARGB, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "ARGB", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_ABGR, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "ABGR", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGB, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGB", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_BGR, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "BGR", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y41B, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y41B", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y42B, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y42B", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_YVYU, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "YVYU", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y444, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y444", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_v210, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "v210", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_v216, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "v216", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV12, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV12", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV21, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV21", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GRAY8, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GRAY8", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GRAY16_BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GRAY16_BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GRAY16_LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GRAY16_LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_v308, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "v308", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGB16, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGB16", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_BGR16, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "BGR16", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGB15, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGB15", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_BGR15, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "BGR15", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_UYVP, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "UYVP", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A420, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A420", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_RGB8P, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "RGB8P", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_YUV9, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "YUV9", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_YVU9, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "YVU9", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_IYU1, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "IYU1", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_ARGB64, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "ARGB64", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_AYUV64, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "AYUV64", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_r210, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "r210", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I420_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I420_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I420_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I420_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I422_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I422_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I422_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I422_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y444_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y444_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y444_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y444_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBR, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBR", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBR_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBR_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBR_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBR_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV16, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV16", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV24, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV24", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV12_64Z32, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV12_64Z32", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A420_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A420_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A420_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A420_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A422_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A422_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A422_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A422_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A444_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A444_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_A444_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "A444_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_NV61, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "NV61", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_P010_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "P010_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_P010_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "P010_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_IYU2, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "IYU2", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_VYUY, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "VYUY", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBRA, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBRA", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBRA_10BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBRA_10BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBRA_10LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBRA_10LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBR_12BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBR_12BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBR_12LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBR_12LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBRA_12BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBRA_12BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_GBRA_12LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "GBRA_12LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I420_12BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I420_12BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I420_12LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I420_12LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I422_12BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I422_12BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_I422_12LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "I422_12LE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y444_12BE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y444_12BE", SPA_TYPE_Int, NULL }, + { SPA_VIDEO_FORMAT_Y444_12LE, SPA_TYPE_INFO_VIDEO_FORMAT_BASE "Y444_12LE", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL }, }; @@ -119,4 +119,4 @@ static const struct spa_type_info spa_type_video_format[] = { } /* extern "C" */ #endif -#endif /* __SPA_VIDEO_RAW_TYPES_H__ */ +#endif /* SPA_VIDEO_RAW_TYPES_H */ diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h index 3a35a7dfa..c09e7a94e 100644 --- a/spa/include/spa/pod/builder.h +++ b/spa/include/spa/pod/builder.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_POD_BUILDER_H__ -#define __SPA_POD_BUILDER_H__ +#ifndef SPA_POD_BUILDER_H +#define SPA_POD_BUILDER_H #ifdef __cplusplus extern "C" { @@ -780,4 +780,4 @@ static inline void *spa_pod_builder_object(struct spa_pod_builder *builder, } /* extern "C" */ #endif -#endif /* __SPA_POD_BUILDER_H__ */ +#endif /* SPA_POD_BUILDER_H */ diff --git a/spa/include/spa/pod/command.h b/spa/include/spa/pod/command.h index 5be5bde7a..b204c3018 100644 --- a/spa/include/spa/pod/command.h +++ b/spa/include/spa/pod/command.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_COMMAND_H__ -#define __SPA_COMMAND_H__ +#ifndef SPA_COMMAND_H +#define SPA_COMMAND_H #ifdef __cplusplus extern "C" { @@ -57,4 +57,4 @@ struct spa_command { } /* extern "C" */ #endif -#endif /* __SPA_COMMAND_H__ */ +#endif /* SPA_COMMAND_H */ diff --git a/spa/include/spa/pod/compare.h b/spa/include/spa/pod/compare.h index 269114037..63cdaedbb 100644 --- a/spa/include/spa/pod/compare.h +++ b/spa/include/spa/pod/compare.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_POD_COMPARE_H__ -#define __SPA_POD_COMPARE_H__ +#ifndef SPA_POD_COMPARE_H +#define SPA_POD_COMPARE_H #ifdef __cplusplus extern "C" { diff --git a/spa/include/spa/pod/event.h b/spa/include/spa/pod/event.h index 188ab6730..a932fb23c 100644 --- a/spa/include/spa/pod/event.h +++ b/spa/include/spa/pod/event.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_EVENT_H__ -#define __SPA_EVENT_H__ +#ifndef SPA_EVENT_H +#define SPA_EVENT_H #ifdef __cplusplus extern "C" { @@ -56,4 +56,4 @@ struct spa_event { } /* extern "C" */ #endif -#endif /* __SPA_EVENT_H__ */ +#endif /* SPA_EVENT_H */ diff --git a/spa/include/spa/pod/iter.h b/spa/include/spa/pod/iter.h index 67f0612c4..caa894ee0 100644 --- a/spa/include/spa/pod/iter.h +++ b/spa/include/spa/pod/iter.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_POD_ITER_H__ -#define __SPA_POD_ITER_H__ +#ifndef SPA_POD_ITER_H +#define SPA_POD_ITER_H #ifdef __cplusplus extern "C" { @@ -173,4 +173,4 @@ static inline int spa_pod_fixate(struct spa_pod *pod) } /* extern "C" */ #endif -#endif /* __SPA_POD_H__ */ +#endif /* SPA_POD_H */ diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h index c6e33b113..2e7a5e7cc 100644 --- a/spa/include/spa/pod/parser.h +++ b/spa/include/spa/pod/parser.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_POD_PARSER_H__ -#define __SPA_POD_PARSER_H__ +#ifndef SPA_POD_PARSER_H +#define SPA_POD_PARSER_H #ifdef __cplusplus extern "C" { @@ -315,9 +315,9 @@ static inline int spa_pod_parser_get(struct spa_pod_parser *parser, #define spa_pod_object_parse(pod,...) \ ({ \ - struct spa_pod_parser __p; \ - spa_pod_parser_pod(&__p, pod); \ - spa_pod_parser_get(&__p, "{", ##__VA_ARGS__, NULL); \ + struct spa_pod_parser _p; \ + spa_pod_parser_pod(&_p, pod); \ + spa_pod_parser_get(&_p, "{", ##__VA_ARGS__, NULL); \ }) static inline int spa_pod_is_bool(struct spa_pod *pod) @@ -431,4 +431,4 @@ static inline int spa_pod_get_fraction(struct spa_pod *pod, struct spa_fraction } /* extern "C" */ #endif -#endif /* __SPA_POD_PARSER_H__ */ +#endif /* SPA_POD_PARSER_H */ diff --git a/spa/include/spa/pod/pod.h b/spa/include/spa/pod/pod.h index 0df461ac8..535fc4056 100644 --- a/spa/include/spa/pod/pod.h +++ b/spa/include/spa/pod/pod.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_POD_H__ -#define __SPA_POD_H__ +#ifndef SPA_POD_H +#define SPA_POD_H #ifdef __cplusplus extern "C" { @@ -58,19 +58,19 @@ struct spa_pod { struct spa_pod_bool { struct spa_pod pod; int32_t value; - int32_t __padding; + int32_t _padding; }; struct spa_pod_id { struct spa_pod pod; uint32_t value; - int32_t __padding; + int32_t _padding; }; struct spa_pod_int { struct spa_pod pod; int32_t value; - int32_t __padding; + int32_t _padding; }; struct spa_pod_long { @@ -81,7 +81,7 @@ struct spa_pod_long { struct spa_pod_float { struct spa_pod pod; float value; - int32_t __padding; + int32_t _padding; }; struct spa_pod_double { @@ -256,4 +256,4 @@ struct spa_pod_sequence { } /* extern "C" */ #endif -#endif /* __SPA_POD_H__ */ +#endif /* SPA_POD_H */ diff --git a/spa/include/spa/support/cpu.h b/spa/include/spa/support/cpu.h index 9c5c0be7f..338fe1253 100644 --- a/spa/include/spa/support/cpu.h +++ b/spa/include/spa/support/cpu.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_CPU_H__ -#define __SPA_CPU_H__ +#ifndef SPA_CPU_H +#define SPA_CPU_H #ifdef __cplusplus extern "C" { @@ -102,4 +102,4 @@ struct spa_cpu { } /* extern "C" */ #endif -#endif /* __SPA_CPU_H__ */ +#endif /* SPA_CPU_H */ diff --git a/spa/include/spa/support/dbus.h b/spa/include/spa/support/dbus.h index f203c28ee..06c1cd468 100644 --- a/spa/include/spa/support/dbus.h +++ b/spa/include/spa/support/dbus.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DBUS_H__ -#define __SPA_DBUS_H__ +#ifndef SPA_DBUS_H +#define SPA_DBUS_H #ifdef __cplusplus extern "C" { @@ -86,4 +86,4 @@ struct spa_dbus { } /* extern "C" */ #endif -#endif /* __SPA_DBUS_H__ */ +#endif /* SPA_DBUS_H */ diff --git a/spa/include/spa/support/log-impl.h b/spa/include/spa/support/log-impl.h index e2b715ddf..90dcb3cc5 100644 --- a/spa/include/spa/support/log-impl.h +++ b/spa/include/spa/support/log-impl.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_LOG_IMPL_H__ -#define __SPA_LOG_IMPL_H__ +#ifndef SPA_LOG_IMPL_H +#define SPA_LOG_IMPL_H #ifdef __cplusplus extern "C" { @@ -80,4 +80,4 @@ struct { \ #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __SPA_LOG_IMPL_H__ */ +#endif /* SPA_LOG_IMPL_H */ diff --git a/spa/include/spa/support/log.h b/spa/include/spa/support/log.h index 8ff399492..99f342c44 100644 --- a/spa/include/spa/support/log.h +++ b/spa/include/spa/support/log.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_LOG_H__ -#define __SPA_LOG_H__ +#ifndef SPA_LOG_H +#define SPA_LOG_H #ifdef __cplusplus extern "C" { @@ -138,4 +138,4 @@ SPA_LOG_FUNC(trace, SPA_LOG_LEVEL_TRACE) #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __SPA_LOG_H__ */ +#endif /* SPA_LOG_H */ diff --git a/spa/include/spa/support/loop.h b/spa/include/spa/support/loop.h index 40e948a16..6358ab6bf 100644 --- a/spa/include/spa/support/loop.h +++ b/spa/include/spa/support/loop.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_LOOP_H__ -#define __SPA_LOOP_H__ +#ifndef SPA_LOOP_H +#define SPA_LOOP_H #ifdef __cplusplus extern "C" { @@ -232,4 +232,4 @@ struct spa_loop_utils { } /* extern "C" */ #endif -#endif /* __SPA_LOOP_H__ */ +#endif /* SPA_LOOP_H */ diff --git a/spa/include/spa/support/plugin.h b/spa/include/spa/support/plugin.h index bd497ba8a..e63e84442 100644 --- a/spa/include/spa/support/plugin.h +++ b/spa/include/spa/support/plugin.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_PLUGIN_H__ -#define __SPA_PLUGIN_H__ +#ifndef SPA_PLUGIN_H +#define SPA_PLUGIN_H #ifdef __cplusplus extern "C" { @@ -190,4 +190,4 @@ int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t } /* extern "C" */ #endif -#endif /* __SPA_PLUGIN_H__ */ +#endif /* SPA_PLUGIN_H */ diff --git a/spa/include/spa/utils/defs.h b/spa/include/spa/utils/defs.h index 715ee7867..401d8fca8 100644 --- a/spa/include/spa/utils/defs.h +++ b/spa/include/spa/utils/defs.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_UTILS_DEFS_H__ -#define __SPA_UTILS_DEFS_H__ +#ifndef SPA_UTILS_DEFS_H +#define SPA_UTILS_DEFS_H #ifdef __cplusplus extern "C" { @@ -206,14 +206,14 @@ struct spa_fraction { #define spa_strerror(err) \ ({ \ - int __err = -err; \ + int _err = -err; \ if (SPA_RESULT_IS_ASYNC(err)) \ - __err = EINPROGRESS; \ - strerror(__err); \ + _err = EINPROGRESS; \ + strerror(_err); \ }) #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __SPA_UTILS_DEFS_H__ */ +#endif /* SPA_UTILS_DEFS_H */ diff --git a/spa/include/spa/utils/dict.h b/spa/include/spa/utils/dict.h index c3b234a6e..585d4ea4a 100644 --- a/spa/include/spa/utils/dict.h +++ b/spa/include/spa/utils/dict.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_DICT_H__ -#define __SPA_DICT_H__ +#ifndef SPA_DICT_H +#define SPA_DICT_H #ifdef __cplusplus extern "C" { @@ -74,4 +74,4 @@ static inline const char *spa_dict_lookup(const struct spa_dict *dict, const cha } /* extern "C" */ #endif -#endif /* __SPA_DICT_H__ */ +#endif /* SPA_DICT_H */ diff --git a/spa/include/spa/utils/hook.h b/spa/include/spa/utils/hook.h index fa9428b03..5b2f6f761 100644 --- a/spa/include/spa/utils/hook.h +++ b/spa/include/spa/utils/hook.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_HOOK_H__ -#define __SPA_HOOK_H__ +#ifndef SPA_HOOK_H +#define SPA_HOOK_H #ifdef __cplusplus extern "C" { @@ -132,4 +132,4 @@ static inline void spa_hook_remove(struct spa_hook *hook) } #endif -#endif /* __SPA_HOOK_H__ */ +#endif /* SPA_HOOK_H */ diff --git a/spa/include/spa/utils/list.h b/spa/include/spa/utils/list.h index 3542e0bfd..02e2bd9e4 100644 --- a/spa/include/spa/utils/list.h +++ b/spa/include/spa/utils/list.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_LIST_H__ -#define __SPA_LIST_H__ +#ifndef SPA_LIST_H +#define SPA_LIST_H #ifdef __cplusplus extern "C" { @@ -123,4 +123,4 @@ static inline void spa_list_remove(struct spa_list *elem) } /* extern "C" */ #endif -#endif /* __SPA_LIST_H__ */ +#endif /* SPA_LIST_H */ diff --git a/spa/include/spa/utils/ringbuffer.h b/spa/include/spa/utils/ringbuffer.h index f87929c88..075a8bb2b 100644 --- a/spa/include/spa/utils/ringbuffer.h +++ b/spa/include/spa/utils/ringbuffer.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_RINGBUFFER_H__ -#define __SPA_RINGBUFFER_H__ +#ifndef SPA_RINGBUFFER_H +#define SPA_RINGBUFFER_H #ifdef __cplusplus extern "C" { @@ -171,4 +171,4 @@ static inline void spa_ringbuffer_write_update(struct spa_ringbuffer *rbuf, int3 } /* extern "C" */ #endif -#endif /* __SPA_RINGBUFFER_H__ */ +#endif /* SPA_RINGBUFFER_H */ diff --git a/spa/include/spa/utils/type-info.h b/spa/include/spa/utils/type-info.h index 9afcc772e..47ba190f6 100644 --- a/spa/include/spa/utils/type-info.h +++ b/spa/include/spa/utils/type-info.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_TYPE_INFO_H__ -#define __SPA_TYPE_INFO_H__ +#ifndef SPA_TYPE_INFO_H +#define SPA_TYPE_INFO_H #ifdef __cplusplus extern "C" { @@ -43,12 +43,12 @@ static inline bool spa_type_is_a(const char *type, const char *parent) #include /* base for parameter object enumerations */ -#define SPA_TYPE__Direction SPA_TYPE_ENUM_BASE "Direction" -#define SPA_TYPE_DIRECTION_BASE SPA_TYPE__Direction ":" +#define SPA_TYPE_INFO_Direction SPA_TYPE_INFO_ENUM_BASE "Direction" +#define SPA_TYPE_INFO_DIRECTION_BASE SPA_TYPE_INFO_Direction ":" static const struct spa_type_info spa_type_direction[] = { - { SPA_DIRECTION_INPUT, SPA_TYPE_DIRECTION_BASE "Input", SPA_TYPE_Int, NULL }, - { SPA_DIRECTION_OUTPUT, SPA_TYPE_DIRECTION_BASE "Output", SPA_TYPE_Int, NULL }, + { SPA_DIRECTION_INPUT, SPA_TYPE_INFO_DIRECTION_BASE "Input", SPA_TYPE_Int, NULL }, + { SPA_DIRECTION_OUTPUT, SPA_TYPE_INFO_DIRECTION_BASE "Output", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL } }; @@ -58,79 +58,79 @@ static const struct spa_type_info spa_type_direction[] = { #include /* base for parameter object enumerations */ -#define SPA_TYPE__Choice SPA_TYPE_ENUM_BASE "Choice" -#define SPA_TYPE_CHOICE_BASE SPA_TYPE__Choice ":" +#define SPA_TYPE_INFO_Choice SPA_TYPE_INFO_ENUM_BASE "Choice" +#define SPA_TYPE_INFO_CHOICE_BASE SPA_TYPE_INFO_Choice ":" static const struct spa_type_info spa_type_choice[] = { - { SPA_CHOICE_None, SPA_TYPE_CHOICE_BASE "None", SPA_TYPE_Int, NULL }, - { SPA_CHOICE_Range, SPA_TYPE_CHOICE_BASE "Range", SPA_TYPE_Int, NULL }, - { SPA_CHOICE_Step, SPA_TYPE_CHOICE_BASE "Step", SPA_TYPE_Int, NULL }, - { SPA_CHOICE_Enum, SPA_TYPE_CHOICE_BASE "Enum", SPA_TYPE_Int, NULL }, - { SPA_CHOICE_Flags, SPA_TYPE_CHOICE_BASE "Flags", SPA_TYPE_Int, NULL }, + { SPA_CHOICE_None, SPA_TYPE_INFO_CHOICE_BASE "None", SPA_TYPE_Int, NULL }, + { SPA_CHOICE_Range, SPA_TYPE_INFO_CHOICE_BASE "Range", SPA_TYPE_Int, NULL }, + { SPA_CHOICE_Step, SPA_TYPE_INFO_CHOICE_BASE "Step", SPA_TYPE_Int, NULL }, + { SPA_CHOICE_Enum, SPA_TYPE_INFO_CHOICE_BASE "Enum", SPA_TYPE_Int, NULL }, + { SPA_CHOICE_Flags, SPA_TYPE_INFO_CHOICE_BASE "Flags", SPA_TYPE_Int, NULL }, { 0, NULL, 0, NULL } }; static const struct spa_type_info spa_types[] = { /* Basic types */ - { SPA_TYPE_START, SPA_TYPE_BASE, SPA_TYPE_START, NULL }, - { SPA_TYPE_None, SPA_TYPE_BASE "None", SPA_TYPE_None, NULL }, - { SPA_TYPE_Bool, SPA_TYPE_BASE "Bool", SPA_TYPE_Bool, NULL }, - { SPA_TYPE_Id, SPA_TYPE_BASE "Id", SPA_TYPE_Int, NULL }, - { SPA_TYPE_Int, SPA_TYPE_BASE "Int", SPA_TYPE_Int, NULL }, - { SPA_TYPE_Long, SPA_TYPE_BASE "Long", SPA_TYPE_Long, NULL }, - { SPA_TYPE_Float, SPA_TYPE_BASE "Float", SPA_TYPE_Float, NULL }, - { SPA_TYPE_Double, SPA_TYPE_BASE "Double", SPA_TYPE_Double, NULL }, - { SPA_TYPE_String, SPA_TYPE_BASE "String", SPA_TYPE_String, NULL }, - { SPA_TYPE_Bytes, SPA_TYPE_BASE "Bytes", SPA_TYPE_Bytes, NULL }, - { SPA_TYPE_Rectangle, SPA_TYPE_BASE "Rectangle", SPA_TYPE_Rectangle, NULL }, - { SPA_TYPE_Fraction, SPA_TYPE_BASE "Fraction", SPA_TYPE_Fraction, NULL }, - { SPA_TYPE_Bitmap, SPA_TYPE_BASE "Bitmap", SPA_TYPE_Bitmap, NULL }, - { SPA_TYPE_Array, SPA_TYPE_BASE "Array", SPA_TYPE_Array, NULL }, - { SPA_TYPE_Pod, SPA_TYPE__Pod, SPA_TYPE_Pod, NULL }, - { SPA_TYPE_Struct, SPA_TYPE__Struct, SPA_TYPE_Pod, NULL }, - { SPA_TYPE_Object, SPA_TYPE__Object, SPA_TYPE_Pod, NULL }, - { SPA_TYPE_Sequence, SPA_TYPE_POD_BASE "Sequence", SPA_TYPE_Pod, NULL }, - { SPA_TYPE_Pointer, SPA_TYPE__Pointer, SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_Fd, SPA_TYPE_BASE "Fd", SPA_TYPE_Fd, NULL }, - { SPA_TYPE_Choice, SPA_TYPE_POD_BASE "Choice", SPA_TYPE_Pod, NULL }, + { SPA_TYPE_START, SPA_TYPE_INFO_BASE, SPA_TYPE_START, NULL }, + { SPA_TYPE_None, SPA_TYPE_INFO_BASE "None", SPA_TYPE_None, NULL }, + { SPA_TYPE_Bool, SPA_TYPE_INFO_BASE "Bool", SPA_TYPE_Bool, NULL }, + { SPA_TYPE_Id, SPA_TYPE_INFO_BASE "Id", SPA_TYPE_Int, NULL }, + { SPA_TYPE_Int, SPA_TYPE_INFO_BASE "Int", SPA_TYPE_Int, NULL }, + { SPA_TYPE_Long, SPA_TYPE_INFO_BASE "Long", SPA_TYPE_Long, NULL }, + { SPA_TYPE_Float, SPA_TYPE_INFO_BASE "Float", SPA_TYPE_Float, NULL }, + { SPA_TYPE_Double, SPA_TYPE_INFO_BASE "Double", SPA_TYPE_Double, NULL }, + { SPA_TYPE_String, SPA_TYPE_INFO_BASE "String", SPA_TYPE_String, NULL }, + { SPA_TYPE_Bytes, SPA_TYPE_INFO_BASE "Bytes", SPA_TYPE_Bytes, NULL }, + { SPA_TYPE_Rectangle, SPA_TYPE_INFO_BASE "Rectangle", SPA_TYPE_Rectangle, NULL }, + { SPA_TYPE_Fraction, SPA_TYPE_INFO_BASE "Fraction", SPA_TYPE_Fraction, NULL }, + { SPA_TYPE_Bitmap, SPA_TYPE_INFO_BASE "Bitmap", SPA_TYPE_Bitmap, NULL }, + { SPA_TYPE_Array, SPA_TYPE_INFO_BASE "Array", SPA_TYPE_Array, NULL }, + { SPA_TYPE_Pod, SPA_TYPE_INFO_Pod, SPA_TYPE_Pod, NULL }, + { SPA_TYPE_Struct, SPA_TYPE_INFO_Struct, SPA_TYPE_Pod, NULL }, + { SPA_TYPE_Object, SPA_TYPE_INFO_Object, SPA_TYPE_Pod, NULL }, + { SPA_TYPE_Sequence, SPA_TYPE_INFO_POD_BASE "Sequence", SPA_TYPE_Pod, NULL }, + { SPA_TYPE_Pointer, SPA_TYPE_INFO_Pointer, SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_Fd, SPA_TYPE_INFO_BASE "Fd", SPA_TYPE_Fd, NULL }, + { SPA_TYPE_Choice, SPA_TYPE_INFO_POD_BASE "Choice", SPA_TYPE_Pod, NULL }, - { SPA_TYPE_POINTER_START, SPA_TYPE__Pointer, SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_POINTER_Buffer, SPA_TYPE_POINTER_BASE "Buffer", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_POINTER_Meta, SPA_TYPE_POINTER_BASE "Meta", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_POINTER_Dict, SPA_TYPE_POINTER_BASE "Dict", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_POINTER_START, SPA_TYPE_INFO_Pointer, SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_POINTER_Buffer, SPA_TYPE_INFO_POINTER_BASE "Buffer", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_POINTER_Meta, SPA_TYPE_INFO_POINTER_BASE "Meta", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_POINTER_Dict, SPA_TYPE_INFO_POINTER_BASE "Dict", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_START, SPA_TYPE__Interface, SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Handle, SPA_TYPE_INTERFACE_BASE "Handle", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_HandleFactory, SPA_TYPE_INTERFACE_BASE "HandleFactory", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Log, SPA_TYPE_INTERFACE_BASE "Log", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Loop, SPA_TYPE_INTERFACE_BASE "Loop", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_LoopControl, SPA_TYPE_INTERFACE_BASE "LoopControl", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_LoopUtils, SPA_TYPE_INTERFACE_BASE "LoopUtils", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_DataLoop, SPA_TYPE_INTERFACE_BASE "DataLoop", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_MainLoop, SPA_TYPE_INTERFACE_BASE "MainLoop", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_DBus, SPA_TYPE_INTERFACE_BASE "DBus", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Monitor, SPA_TYPE_INTERFACE_BASE "Monitor", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Node, SPA_TYPE_INTERFACE_BASE "Node", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_Device, SPA_TYPE_INTERFACE_BASE "Device", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_INTERFACE_CPU, SPA_TYPE_INTERFACE_BASE "CPU", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_START, SPA_TYPE_INFO_Interface, SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Handle, SPA_TYPE_INFO_INTERFACE_BASE "Handle", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_HandleFactory, SPA_TYPE_INFO_INTERFACE_BASE "HandleFactory", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Log, SPA_TYPE_INFO_INTERFACE_BASE "Log", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Loop, SPA_TYPE_INFO_INTERFACE_BASE "Loop", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_LoopControl, SPA_TYPE_INFO_INTERFACE_BASE "LoopControl", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_LoopUtils, SPA_TYPE_INFO_INTERFACE_BASE "LoopUtils", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_DataLoop, SPA_TYPE_INFO_INTERFACE_BASE "DataLoop", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_MainLoop, SPA_TYPE_INFO_INTERFACE_BASE "MainLoop", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_DBus, SPA_TYPE_INFO_INTERFACE_BASE "DBus", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Monitor, SPA_TYPE_INFO_INTERFACE_BASE "Monitor", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Node, SPA_TYPE_INFO_INTERFACE_BASE "Node", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_Device, SPA_TYPE_INFO_INTERFACE_BASE "Device", SPA_TYPE_Pointer, NULL }, + { SPA_TYPE_INTERFACE_CPU, SPA_TYPE_INFO_INTERFACE_BASE "CPU", SPA_TYPE_Pointer, NULL }, - { SPA_TYPE_EVENT_START, SPA_TYPE__Event, SPA_TYPE_Object, NULL }, - { SPA_TYPE_EVENT_Monitor, SPA_TYPE_EVENT_BASE "Monitor", SPA_TYPE_Object, spa_type_monitor_event }, - { SPA_TYPE_EVENT_Node, SPA_TYPE_EVENT_BASE "Node", SPA_TYPE_Object, spa_type_node_event }, + { SPA_TYPE_EVENT_START, SPA_TYPE_INFO_Event, SPA_TYPE_Object, NULL }, + { SPA_TYPE_EVENT_Monitor, SPA_TYPE_INFO_EVENT_BASE "Monitor", SPA_TYPE_Object, spa_type_monitor_event }, + { SPA_TYPE_EVENT_Node, SPA_TYPE_INFO_EVENT_BASE "Node", SPA_TYPE_Object, spa_type_node_event }, - { SPA_TYPE_COMMAND_START, SPA_TYPE__Command, SPA_TYPE_Object, NULL }, - { SPA_TYPE_COMMAND_Node, SPA_TYPE_COMMAND_BASE "Node", SPA_TYPE_Object, spa_type_node_command }, + { SPA_TYPE_COMMAND_START, SPA_TYPE_INFO_Command, SPA_TYPE_Object, NULL }, + { SPA_TYPE_COMMAND_Node, SPA_TYPE_INFO_COMMAND_BASE "Node", SPA_TYPE_Object, spa_type_node_command }, - { SPA_TYPE_OBJECT_START, SPA_TYPE__Object, SPA_TYPE_Object, NULL }, - { SPA_TYPE_OBJECT_MonitorItem, SPA_TYPE__MonitorItem, SPA_TYPE_Object, spa_type_monitor_item }, - { SPA_TYPE_OBJECT_ParamList, SPA_TYPE_PARAM__List, SPA_TYPE_Object, spa_type_param_list, }, - { SPA_TYPE_OBJECT_PropInfo, SPA_TYPE__PropInfo, SPA_TYPE_Object, spa_type_prop_info, }, - { SPA_TYPE_OBJECT_Props, SPA_TYPE__Props, SPA_TYPE_Object, spa_type_props }, - { SPA_TYPE_OBJECT_Format, SPA_TYPE__Format, SPA_TYPE_Object, spa_type_format }, - { SPA_TYPE_OBJECT_ParamBuffers, SPA_TYPE_PARAM__Buffers, SPA_TYPE_Object, spa_type_param_buffers, }, - { SPA_TYPE_OBJECT_ParamMeta, SPA_TYPE_PARAM__Meta, SPA_TYPE_Object, spa_type_param_meta }, - { SPA_TYPE_OBJECT_ParamIO, SPA_TYPE_PARAM__IO, SPA_TYPE_Object, spa_type_param_io }, - { SPA_TYPE_OBJECT_ParamProfile, SPA_TYPE_PARAM__Profile, SPA_TYPE_Object, spa_type_param_profile }, + { SPA_TYPE_OBJECT_START, SPA_TYPE_INFO_Object, SPA_TYPE_Object, NULL }, + { SPA_TYPE_OBJECT_MonitorItem, SPA_TYPE_INFO_MonitorItem, SPA_TYPE_Object, spa_type_monitor_item }, + { SPA_TYPE_OBJECT_ParamList, SPA_TYPE_INFO_PARAM_List, SPA_TYPE_Object, spa_type_param_list, }, + { SPA_TYPE_OBJECT_PropInfo, SPA_TYPE_INFO_PropInfo, SPA_TYPE_Object, spa_type_prop_info, }, + { SPA_TYPE_OBJECT_Props, SPA_TYPE_INFO_Props, SPA_TYPE_Object, spa_type_props }, + { SPA_TYPE_OBJECT_Format, SPA_TYPE_INFO_Format, SPA_TYPE_Object, spa_type_format }, + { SPA_TYPE_OBJECT_ParamBuffers, SPA_TYPE_INFO_PARAM_Buffers, SPA_TYPE_Object, spa_type_param_buffers, }, + { SPA_TYPE_OBJECT_ParamMeta, SPA_TYPE_INFO_PARAM_Meta, SPA_TYPE_Object, spa_type_param_meta }, + { SPA_TYPE_OBJECT_ParamIO, SPA_TYPE_INFO_PARAM_IO, SPA_TYPE_Object, spa_type_param_io }, + { SPA_TYPE_OBJECT_ParamProfile, SPA_TYPE_INFO_PARAM_Profile, SPA_TYPE_Object, spa_type_param_profile }, { 0, NULL, 0, NULL } }; @@ -139,4 +139,4 @@ static const struct spa_type_info spa_types[] = { } /* extern "C" */ #endif -#endif /* __SPA_TYPE_INFO_H__ */ +#endif /* SPA_TYPE_INFO_H */ diff --git a/spa/include/spa/utils/type.h b/spa/include/spa/utils/type.h index 437e7be55..07e87b17c 100644 --- a/spa/include/spa/utils/type.h +++ b/spa/include/spa/utils/type.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_TYPE_H__ -#define __SPA_TYPE_H__ +#ifndef SPA_TYPE_H +#define SPA_TYPE_H #ifdef __cplusplus extern "C" { @@ -110,34 +110,34 @@ enum { SPA_TYPE_VENDOR_Other = 0x7f000000, }; -#define SPA_TYPE_BASE "Spa:" +#define SPA_TYPE_INFO_BASE "Spa:" -#define SPA_TYPE__Flags SPA_TYPE_BASE "Flags" -#define SPA_TYPE_FLAGS_BASE SPA_TYPE__Flags ":" +#define SPA_TYPE_INFO_Flags SPA_TYPE_INFO_BASE "Flags" +#define SPA_TYPE_INFO_FLAGS_BASE SPA_TYPE_INFO_Flags ":" -#define SPA_TYPE__Enum SPA_TYPE_BASE "Enum" -#define SPA_TYPE_ENUM_BASE SPA_TYPE__Enum ":" +#define SPA_TYPE_INFO_Enum SPA_TYPE_INFO_BASE "Enum" +#define SPA_TYPE_INFO_ENUM_BASE SPA_TYPE_INFO_Enum ":" -#define SPA_TYPE__Pod SPA_TYPE_BASE "Pod" -#define SPA_TYPE_POD_BASE SPA_TYPE__Pod ":" +#define SPA_TYPE_INFO_Pod SPA_TYPE_INFO_BASE "Pod" +#define SPA_TYPE_INFO_POD_BASE SPA_TYPE_INFO_Pod ":" -#define SPA_TYPE__Struct SPA_TYPE_POD_BASE "Struct" -#define SPA_TYPE_STRUCT_BASE SPA_TYPE__Struct ":" +#define SPA_TYPE_INFO_Struct SPA_TYPE_INFO_POD_BASE "Struct" +#define SPA_TYPE_INFO_STRUCT_BASE SPA_TYPE_INFO_Struct ":" -#define SPA_TYPE__Object SPA_TYPE_POD_BASE "Object" -#define SPA_TYPE_OBJECT_BASE SPA_TYPE__Object ":" +#define SPA_TYPE_INFO_Object SPA_TYPE_INFO_POD_BASE "Object" +#define SPA_TYPE_INFO_OBJECT_BASE SPA_TYPE_INFO_Object ":" -#define SPA_TYPE__Pointer SPA_TYPE_BASE "Pointer" -#define SPA_TYPE_POINTER_BASE SPA_TYPE__Pointer ":" +#define SPA_TYPE_INFO_Pointer SPA_TYPE_INFO_BASE "Pointer" +#define SPA_TYPE_INFO_POINTER_BASE SPA_TYPE_INFO_Pointer ":" -#define SPA_TYPE__Interface SPA_TYPE_POINTER_BASE "Interface" -#define SPA_TYPE_INTERFACE_BASE SPA_TYPE__Interface ":" +#define SPA_TYPE_INFO_Interface SPA_TYPE_INFO_POINTER_BASE "Interface" +#define SPA_TYPE_INFO_INTERFACE_BASE SPA_TYPE_INFO_Interface ":" -#define SPA_TYPE__Event SPA_TYPE_OBJECT_BASE "Event" -#define SPA_TYPE_EVENT_BASE SPA_TYPE__Event ":" +#define SPA_TYPE_INFO_Event SPA_TYPE_INFO_OBJECT_BASE "Event" +#define SPA_TYPE_INFO_EVENT_BASE SPA_TYPE_INFO_Event ":" -#define SPA_TYPE__Command SPA_TYPE_OBJECT_BASE "Command" -#define SPA_TYPE_COMMAND_BASE SPA_TYPE__Command ":" +#define SPA_TYPE_INFO_Command SPA_TYPE_INFO_OBJECT_BASE "Command" +#define SPA_TYPE_INFO_COMMAND_BASE SPA_TYPE_INFO_Command ":" struct spa_type_info { uint32_t type; @@ -150,4 +150,4 @@ struct spa_type_info { } /* extern "C" */ #endif -#endif /* __SPA_TYPE_H__ */ +#endif /* SPA_TYPE_H */ diff --git a/spa/plugins/alsa/alsa-utils.h b/spa/plugins/alsa/alsa-utils.h index a453daf1f..6b9474c4e 100644 --- a/spa/plugins/alsa/alsa-utils.h +++ b/spa/plugins/alsa/alsa-utils.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_ALSA_UTILS_H__ -#define __SPA_ALSA_UTILS_H__ +#ifndef SPA_ALSA_UTILS_H +#define SPA_ALSA_UTILS_H #ifdef __cplusplus extern "C" { @@ -193,4 +193,4 @@ static inline double dll_update(struct dll *dll, double tw, double period) } /* extern "C" */ #endif -#endif /* __SPA_ALSA_UTILS_H__ */ +#endif /* SPA_ALSA_UTILS_H */ diff --git a/spa/plugins/bluez5/defs.h b/spa/plugins/bluez5/defs.h index d3042e325..6d439d83e 100644 --- a/spa/plugins/bluez5/defs.h +++ b/spa/plugins/bluez5/defs.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __SPA_BLUEZ5_DEFS_H__ -#define __SPA_BLUEZ5_DEFS_H__ +#ifndef SPA_BLUEZ5_DEFS_H +#define SPA_BLUEZ5_DEFS_H #ifdef __cplusplus extern "C" { @@ -222,4 +222,4 @@ static inline enum spa_bt_transport_state spa_bt_transport_state_from_string(con } /* extern "C" */ #endif -#endif /* __SPA_BLUEZ5_DEFS_H__ */ +#endif /* SPA_BLUEZ5_DEFS_H */ diff --git a/spa/tests/test-props.c b/spa/tests/test-props.c index 0937e15c8..33374472f 100644 --- a/spa/tests/test-props.c +++ b/spa/tests/test-props.c @@ -477,14 +477,5 @@ int main(int argc, char *argv[]) spa_debug_pod(0, NULL, &fmt->pod); spa_debug_format(0, NULL, &fmt->pod); -#if 0 - printf("media type is enum %d\n", spa_type_is_a(SPA_TYPE__mediaType, SPA_TYPE_ENUM_BASE)); - printf("media sybtype is enum %d\n", - spa_type_is_a(SPA_TYPE__mediaSubtype, SPA_TYPE_ENUM_BASE)); - printf("format is enum %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_ENUM_BASE)); - printf("format is pod %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_BASE)); - printf("format is object %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_OBJECT_BASE)); -#endif - return 0; } diff --git a/src/daemon/daemon-config.h b/src/daemon/daemon-config.h index 193dcd149..a88b62607 100644 --- a/src/daemon/daemon-config.h +++ b/src/daemon/daemon-config.h @@ -23,8 +23,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_DAEMON_CONFIG_H__ -#define __PIPEWIRE_DAEMON_CONFIG_H__ +#ifndef PIPEWIRE_DAEMON_CONFIG_H +#define PIPEWIRE_DAEMON_CONFIG_H #ifdef __cplusplus extern "C" { @@ -50,4 +50,4 @@ int pw_daemon_config_run_commands(struct pw_daemon_config *config, struct pw_cor } #endif -#endif /* __PIPEWIRE_DAEMON_CONFIG_H__ */ +#endif /* PIPEWIRE_DAEMON_CONFIG_H */ diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c index fe5f88b64..2b0bbd412 100644 --- a/src/examples/export-sink.c +++ b/src/examples/export-sink.c @@ -34,8 +34,6 @@ #include #include -#include -#include #define WIDTH 640 #define HEIGHT 480 diff --git a/src/examples/export-spa.c b/src/examples/export-spa.c index afd01e99b..bb46eb967 100644 --- a/src/examples/export-spa.c +++ b/src/examples/export-spa.c @@ -30,7 +30,6 @@ #include #include -#include struct data { struct pw_main_loop *loop; diff --git a/src/examples/local-v4l2.c b/src/examples/local-v4l2.c index 5b2ffb46d..a963fd013 100644 --- a/src/examples/local-v4l2.c +++ b/src/examples/local-v4l2.c @@ -37,8 +37,6 @@ #include #include -#include -#include struct data { SDL_Renderer *renderer; diff --git a/src/examples/media-session.c b/src/examples/media-session.c index e5d811345..40b0871dd 100644 --- a/src/examples/media-session.c +++ b/src/examples/media-session.c @@ -36,12 +36,7 @@ #include #include -#include "pipewire/core.h" -#include "pipewire/control.h" -#include "pipewire/link.h" -#include "pipewire/log.h" -#include "pipewire/module.h" -#include "pipewire/type.h" +#include "pipewire/pipewire.h" #include "pipewire/private.h" #define NAME "media-session" diff --git a/src/extensions/client-node.h b/src/extensions/client-node.h index 707036437..0f0ebe6d0 100644 --- a/src/extensions/client-node.h +++ b/src/extensions/client-node.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_EXT_CLIENT_NODE_H__ -#define __PIPEWIRE_EXT_CLIENT_NODE_H__ +#ifndef PIPEWIRE_EXT_CLIENT_NODE_H +#define PIPEWIRE_EXT_CLIENT_NODE_H #ifdef __cplusplus extern "C" { @@ -389,4 +389,4 @@ pw_client_node_proxy_add_listener(struct pw_client_node_proxy *p, } /* extern "C" */ #endif -#endif /* __PIPEWIRE_EXT_CLIENT_NODE_H__ */ +#endif /* PIPEWIRE_EXT_CLIENT_NODE_H */ diff --git a/src/extensions/protocol-native.h b/src/extensions/protocol-native.h index e46015bf6..5f2da3aba 100644 --- a/src/extensions/protocol-native.h +++ b/src/extensions/protocol-native.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_EXT_PROTOCOL_NATIVE_H__ -#define __PIPEWIRE_EXT_PROTOCOL_NATIVE_H__ +#ifndef PIPEWIRE_EXT_PROTOCOL_NATIVE_H +#define PIPEWIRE_EXT_PROTOCOL_NATIVE_H #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ extern "C" { #include #include -#define PW_TYPE_PROTOCOL__Native PW_TYPE_PROTOCOL_BASE "Native" +#define PW_TYPE_INFO_PROTOCOL_Native PW_TYPE_INFO_PROTOCOL_BASE "Native" struct pw_protocol_native_demarshal { int (*func) (void *object, void *data, size_t size); @@ -79,4 +79,4 @@ struct pw_protocol_native_ext { } /* extern "C" */ #endif -#endif /* __PIPEWIRE_EXT_PROTOCOL_NATIVE_H__ */ +#endif /* PIPEWIRE_EXT_PROTOCOL_NATIVE_H */ diff --git a/src/modules/module-access.c b/src/modules/module-access.c index 6d82329c2..c7a645352 100644 --- a/src/modules/module-access.c +++ b/src/modules/module-access.c @@ -32,13 +32,7 @@ #include "config.h" -#include "pipewire/core.h" -#include "pipewire/interfaces.h" -#include "pipewire/link.h" -#include "pipewire/log.h" -#include "pipewire/module.h" -#include "pipewire/properties.h" -#include "pipewire/utils.h" +#include static const struct spa_dict_item module_props[] = { { PW_MODULE_PROP_AUTHOR, "Wim Taymans " }, diff --git a/src/modules/module-audio-dsp.c b/src/modules/module-audio-dsp.c index 3d9aee540..1a36407b1 100644 --- a/src/modules/module-audio-dsp.c +++ b/src/modules/module-audio-dsp.c @@ -34,10 +34,7 @@ #include #include -#include "pipewire/core.h" -#include "pipewire/interfaces.h" -#include "pipewire/log.h" -#include "pipewire/module.h" +#include #include "pipewire/private.h" #include "module-audio-dsp/audio-dsp.h" diff --git a/src/modules/module-audio-dsp/audio-dsp.c b/src/modules/module-audio-dsp/audio-dsp.c index dee73b2af..074d5c2eb 100644 --- a/src/modules/module-audio-dsp/audio-dsp.c +++ b/src/modules/module-audio-dsp/audio-dsp.c @@ -36,11 +36,7 @@ #include #include -#include "pipewire/core.h" -#include "pipewire/link.h" -#include "pipewire/log.h" -#include "pipewire/module.h" -#include "pipewire/type.h" +#include "pipewire/pipewire.h" #include "pipewire/private.h" #include "modules/spa/spa-node.h" diff --git a/src/modules/module-audio-dsp/audio-dsp.h b/src/modules/module-audio-dsp/audio-dsp.h index aed5842a2..24cdb9bc7 100644 --- a/src/modules/module-audio-dsp/audio-dsp.h +++ b/src/modules/module-audio-dsp/audio-dsp.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_AUDIO_DSP_H__ -#define __PIPEWIRE_AUDIO_DSP_H__ +#ifndef PIPEWIRE_AUDIO_DSP_H +#define PIPEWIRE_AUDIO_DSP_H #include #include @@ -45,4 +45,4 @@ void *pw_audio_dsp_get_user_data(struct pw_node *node); } #endif -#endif /* __PIPEWIRE_AUDIO_DSP_H__ */ +#endif /* PIPEWIRE_AUDIO_DSP_H */ diff --git a/src/modules/module-client-node.c b/src/modules/module-client-node.c index da1fbcf71..174613001 100644 --- a/src/modules/module-client-node.c +++ b/src/modules/module-client-node.c @@ -29,10 +29,7 @@ #include "config.h" -#include "pipewire/core.h" -#include "pipewire/interfaces.h" -#include "pipewire/log.h" -#include "pipewire/module.h" +#include #include "module-client-node/client-node.h" #include "module-client-node/client-stream.h" diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index 2cd7d934c..1d12a6a12 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -37,11 +37,9 @@ #include #include -#include "pipewire/pipewire.h" -#include "pipewire/interfaces.h" +#include #include "pipewire/private.h" -#include "pipewire/core.h" #include "modules/spa/spa-node.h" #include "client-node.h" diff --git a/src/modules/module-client-node/client-node.h b/src/modules/module-client-node/client-node.h index 33a74a088..1dcf42999 100644 --- a/src/modules/module-client-node/client-node.h +++ b/src/modules/module-client-node/client-node.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_CLIENT_NODE_H__ -#define __PIPEWIRE_CLIENT_NODE_H__ +#ifndef PIPEWIRE_CLIENT_NODE_H +#define PIPEWIRE_CLIENT_NODE_H #include #include @@ -58,4 +58,4 @@ void pw_client_node_registered(struct pw_client_node *node, uint32_t node_id); } #endif -#endif /* __PIPEWIRE_CLIENT_NODE_H__ */ +#endif /* PIPEWIRE_CLIENT_NODE_H */ diff --git a/src/modules/module-client-node/client-stream.h b/src/modules/module-client-node/client-stream.h index 8a1099450..d22ef5ce1 100644 --- a/src/modules/module-client-node/client-stream.h +++ b/src/modules/module-client-node/client-stream.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_CLIENT_STREAM_H__ -#define __PIPEWIRE_CLIENT_STREAM_H__ +#ifndef PIPEWIRE_CLIENT_STREAM_H +#define PIPEWIRE_CLIENT_STREAM_H #include @@ -51,4 +51,4 @@ pw_client_stream_destroy(struct pw_client_stream *stream); } #endif -#endif /* __PIPEWIRE_CLIENT_STREAM_H__ */ +#endif /* PIPEWIRE_CLIENT_STREAM_H */ diff --git a/src/modules/module-client-node/protocol-native.c b/src/modules/module-client-node/protocol-native.c index 42c8a2d43..4b7be2de0 100644 --- a/src/modules/module-client-node/protocol-native.c +++ b/src/modules/module-client-node/protocol-native.c @@ -26,13 +26,10 @@ #include -#include "pipewire/pipewire.h" -#include "pipewire/interfaces.h" -#include "pipewire/protocol.h" -#include "pipewire/client.h" +#include -#include "extensions/protocol-native.h" -#include "extensions/client-node.h" +#include +#include static void client_node_marshal_done(void *object, int seq, int res) @@ -928,7 +925,7 @@ struct pw_protocol *pw_protocol_native_ext_client_node_init(struct pw_core *core { struct pw_protocol *protocol; - protocol = pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native); + protocol = pw_core_find_protocol(core, PW_TYPE_INFO_PROTOCOL_Native); if (protocol == NULL) return NULL; diff --git a/src/modules/module-link-factory.c b/src/modules/module-link-factory.c index 0f866ec27..eebfa6fbc 100644 --- a/src/modules/module-link-factory.c +++ b/src/modules/module-link-factory.c @@ -29,11 +29,7 @@ #include "config.h" -#include "pipewire/core.h" -#include "pipewire/interfaces.h" -#include "pipewire/log.h" -#include "pipewire/module.h" -#include "pipewire/link.h" +#include #include "pipewire/private.h" static const struct spa_dict_item module_props[] = { diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c index cc6d72c4c..8ea1b5371 100644 --- a/src/modules/module-protocol-native.c +++ b/src/modules/module-protocol-native.c @@ -42,21 +42,10 @@ #include #endif -#include "pipewire/pipewire.h" +#include +#include #include "pipewire/private.h" -#include "pipewire/log.h" -#include "pipewire/interfaces.h" -#include "pipewire/core.h" -#include "pipewire/node.h" -#include "pipewire/module.h" -#include "pipewire/client.h" -#include "pipewire/resource.h" -#include "pipewire/link.h" -#include "pipewire/factory.h" -#include "pipewire/data-loop.h" -#include "pipewire/main-loop.h" -#include "extensions/protocol-native.h" #include "modules/module-protocol-native/connection.h" #include "modules/module-protocol-native/defs.h" @@ -854,10 +843,10 @@ static int module_init(struct pw_module *module, struct pw_properties *propertie const char *val; struct protocol_data *d; - if (pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native) != NULL) + if (pw_core_find_protocol(core, PW_TYPE_INFO_PROTOCOL_Native) != NULL) return 0; - this = pw_protocol_new(core, PW_TYPE_PROTOCOL__Native, sizeof(struct protocol_data)); + this = pw_protocol_new(core, PW_TYPE_INFO_PROTOCOL_Native, sizeof(struct protocol_data)); if (this == NULL) return -ENOMEM; diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c index 6ec19dcde..133afb79b 100644 --- a/src/modules/module-protocol-native/connection.c +++ b/src/modules/module-protocol-native/connection.c @@ -33,7 +33,7 @@ #include #include -#include +#include "pipewire/private.h" #include "connection.h" diff --git a/src/modules/module-protocol-native/connection.h b/src/modules/module-protocol-native/connection.h index f15815a78..ec064384e 100644 --- a/src/modules/module-protocol-native/connection.h +++ b/src/modules/module-protocol-native/connection.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__ -#define __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__ +#ifndef PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H +#define PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H #ifdef __cplusplus extern "C" { @@ -104,4 +104,4 @@ pw_protocol_native_connection_clear(struct pw_protocol_native_connection *conn); } /* extern "C" */ #endif -#endif /* __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__ */ +#endif /* PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H */ diff --git a/src/modules/module-protocol-native/local-socket.c b/src/modules/module-protocol-native/local-socket.c index be10bb806..7669fa03a 100644 --- a/src/modules/module-protocol-native/local-socket.c +++ b/src/modules/module-protocol-native/local-socket.c @@ -35,7 +35,6 @@ #include #include -#include static const char * get_remote(const struct pw_properties *properties) diff --git a/src/modules/module-protocol-native/portal-screencast.c b/src/modules/module-protocol-native/portal-screencast.c index 0269cbe2f..d5f2ba59d 100644 --- a/src/modules/module-protocol-native/portal-screencast.c +++ b/src/modules/module-protocol-native/portal-screencast.c @@ -31,7 +31,6 @@ #include #include -#include int pw_protocol_native_connect_portal_screencast(struct pw_protocol_client *client, void (*done_callback) (void *data, int res), diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index 13e8c03ee..38bc4a758 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -25,13 +25,10 @@ #include #include -#include "spa/pod/parser.h" +#include -#include "pipewire/pipewire.h" -#include "pipewire/protocol.h" -#include "pipewire/interfaces.h" -#include "pipewire/resource.h" -#include "extensions/protocol-native.h" +#include +#include #include "connection.h" diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c index cf44844fe..87ae6adc8 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rtkit.c @@ -39,12 +39,7 @@ #include -#include "pipewire/core.h" -#include "pipewire/interfaces.h" -#include "pipewire/link.h" -#include "pipewire/log.h" -#include "pipewire/module.h" -#include "pipewire/utils.h" +#include static const struct spa_dict_item module_props[] = { { PW_MODULE_PROP_AUTHOR, "Wim Taymans " }, diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c index 075a8852a..3f07e6fc9 100644 --- a/src/modules/spa/module-node-factory.c +++ b/src/modules/spa/module-node-factory.c @@ -29,10 +29,7 @@ #include "config.h" -#include "pipewire/interfaces.h" -#include "pipewire/core.h" -#include "pipewire/log.h" -#include "pipewire/module.h" +#include "pipewire/pipewire.h" #include "spa-node.h" diff --git a/src/modules/spa/spa-device.c b/src/modules/spa/spa-device.c index 66bbea7ba..4632262fd 100644 --- a/src/modules/spa/spa-device.c +++ b/src/modules/spa/spa-device.c @@ -39,6 +39,7 @@ #include "pipewire/port.h" #include "pipewire/log.h" #include "pipewire/private.h" +#include "pipewire/pipewire.h" struct impl { struct pw_device *this; diff --git a/src/modules/spa/spa-device.h b/src/modules/spa/spa-device.h index 039a6508e..b187180d3 100644 --- a/src/modules/spa/spa-device.h +++ b/src/modules/spa/spa-device.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_SPA_DEVICE_H__ -#define __PIPEWIRE_SPA_DEVICE_H__ +#ifndef PIPEWIRE_SPA_DEVICE_H +#define PIPEWIRE_SPA_DEVICE_H #include @@ -67,4 +67,4 @@ void *pw_spa_device_get_user_data(struct pw_device *device); } #endif -#endif /* __PIPEWIRE_SPA_DEVICE_H__ */ +#endif /* PIPEWIRE_SPA_DEVICE_H */ diff --git a/src/modules/spa/spa-monitor.h b/src/modules/spa/spa-monitor.h index cf87d6e89..c9b05694f 100644 --- a/src/modules/spa/spa-monitor.h +++ b/src/modules/spa/spa-monitor.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_SPA_MONITOR_H__ -#define __PIPEWIRE_SPA_MONITOR_H__ +#ifndef PIPEWIRE_SPA_MONITOR_H +#define PIPEWIRE_SPA_MONITOR_H #include @@ -59,4 +59,4 @@ pw_spa_monitor_destroy(struct pw_spa_monitor *monitor); } #endif -#endif /* __PIPEWIRE_SPA_MONITOR_H__ */ +#endif /* PIPEWIRE_SPA_MONITOR_H */ diff --git a/src/modules/spa/spa-node.h b/src/modules/spa/spa-node.h index 492ee98c9..29c0bff95 100644 --- a/src/modules/spa/spa-node.h +++ b/src/modules/spa/spa-node.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_SPA_NODE_H__ -#define __PIPEWIRE_SPA_NODE_H__ +#ifndef PIPEWIRE_SPA_NODE_H +#define PIPEWIRE_SPA_NODE_H #include @@ -69,4 +69,4 @@ void *pw_spa_node_get_user_data(struct pw_node *node); } #endif -#endif /* __PIPEWIRE_SPA_NODE_H__ */ +#endif /* PIPEWIRE_SPA_NODE_H */ diff --git a/src/pipewire/array.h b/src/pipewire/array.h index 5c6ccd834..3ffc07ca8 100644 --- a/src/pipewire/array.h +++ b/src/pipewire/array.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_ARRAY_H__ -#define __PIPEWIRE_ARRAY_H__ +#ifndef PIPEWIRE_ARRAY_H +#define PIPEWIRE_ARRAY_H #ifdef __cplusplus extern "C" { @@ -152,4 +152,4 @@ static inline void *pw_array_add_fixed(struct pw_array *arr, size_t size) } /* extern "C" */ #endif -#endif /* __PIPEWIRE_ARRAY_H__ */ +#endif /* PIPEWIRE_ARRAY_H */ diff --git a/src/pipewire/client.c b/src/pipewire/client.c index 5fbffde3b..aea69bd16 100644 --- a/src/pipewire/client.c +++ b/src/pipewire/client.c @@ -25,12 +25,11 @@ #include #include -#include "pipewire/pipewire.h" #include "pipewire/interfaces.h" - #include "pipewire/client.h" #include "pipewire/private.h" #include "pipewire/resource.h" +#include "pipewire/type.h" /** \cond */ struct impl { diff --git a/src/pipewire/client.h b/src/pipewire/client.h index 2d218db15..c60498d8f 100644 --- a/src/pipewire/client.h +++ b/src/pipewire/client.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_CLIENT_H__ -#define __PIPEWIRE_CLIENT_H__ +#ifndef PIPEWIRE_CLIENT_H +#define PIPEWIRE_CLIENT_H #ifdef __cplusplus extern "C" { @@ -187,4 +187,4 @@ void pw_client_set_busy(struct pw_client *client, bool busy); } #endif -#endif /* __PIPEWIRE_CLIENT_H__ */ +#endif /* PIPEWIRE_CLIENT_H */ diff --git a/src/pipewire/command.c b/src/pipewire/command.c index 6a93883bf..da51c689c 100644 --- a/src/pipewire/command.c +++ b/src/pipewire/command.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/src/pipewire/command.h b/src/pipewire/command.h index 07071b45a..cda0965e3 100644 --- a/src/pipewire/command.h +++ b/src/pipewire/command.h @@ -23,8 +23,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_COMMAND_H__ -#define __PIPEWIRE_COMMAND_H__ +#ifndef PIPEWIRE_COMMAND_H +#define PIPEWIRE_COMMAND_H #ifdef __cplusplus extern "C" { @@ -51,4 +51,4 @@ int pw_command_run(struct pw_command *command, struct pw_core *core, char **err) } #endif -#endif /* __PIPEWIRE_COMMAND_H__ */ +#endif /* PIPEWIRE_COMMAND_H */ diff --git a/src/pipewire/control.h b/src/pipewire/control.h index 91005f101..aae79d930 100644 --- a/src/pipewire/control.h +++ b/src/pipewire/control.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_CONTROL_H__ -#define __PIPEWIRE_CONTROL_H__ +#ifndef PIPEWIRE_CONTROL_H +#define PIPEWIRE_CONTROL_H #ifdef __cplusplus extern "C" { @@ -81,4 +81,4 @@ int pw_control_unlink(struct pw_control *control, struct pw_control *other); } #endif -#endif /* __PIPEWIRE_CONTROL_H__ */ +#endif /* PIPEWIRE_CONTROL_H */ diff --git a/src/pipewire/core.c b/src/pipewire/core.c index 145921f36..906c7ed49 100644 --- a/src/pipewire/core.c +++ b/src/pipewire/core.c @@ -39,6 +39,10 @@ #include #include #include +#include +#include +#include +#include /** \cond */ struct impl { diff --git a/src/pipewire/core.h b/src/pipewire/core.h index 43a00c78e..c660b46bf 100644 --- a/src/pipewire/core.h +++ b/src/pipewire/core.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_CORE_H__ -#define __PIPEWIRE_CORE_H__ +#ifndef PIPEWIRE_CORE_H +#define PIPEWIRE_CORE_H #ifdef __cplusplus extern "C" { @@ -42,13 +42,11 @@ extern "C" { */ struct pw_core; -#include #include -#include #include +#include #include #include -#include #include /** \page page_core_api Core API @@ -164,4 +162,4 @@ pw_core_find_factory(struct pw_core *core /**< the core */, } #endif -#endif /* __PIPEWIRE_CORE_H__ */ +#endif /* PIPEWIRE_CORE_H */ diff --git a/src/pipewire/data-loop.h b/src/pipewire/data-loop.h index 9144d668d..d01188df7 100644 --- a/src/pipewire/data-loop.h +++ b/src/pipewire/data-loop.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_DATA_LOOP_H__ -#define __PIPEWIRE_DATA_LOOP_H__ +#ifndef PIPEWIRE_DATA_LOOP_H +#define PIPEWIRE_DATA_LOOP_H #ifdef __cplusplus extern "C" { @@ -79,4 +79,4 @@ bool pw_data_loop_in_thread(struct pw_data_loop *loop); } #endif -#endif /* __PIPEWIRE_DATA_LOOP_H__ */ +#endif /* PIPEWIRE_DATA_LOOP_H */ diff --git a/src/pipewire/device.c b/src/pipewire/device.c index 5612cc0e3..d2c65bb6b 100644 --- a/src/pipewire/device.c +++ b/src/pipewire/device.c @@ -26,9 +26,10 @@ #include -#include "pipewire/pipewire.h" #include "pipewire/device.h" #include "pipewire/private.h" +#include "pipewire/interfaces.h" +#include "pipewire/type.h" struct resource_data { struct spa_hook resource_listener; diff --git a/src/pipewire/device.h b/src/pipewire/device.h index 969ca4a26..3aa969a54 100644 --- a/src/pipewire/device.h +++ b/src/pipewire/device.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_DEVICE_H__ -#define __PIPEWIRE_DEVICE_H__ +#ifndef PIPEWIRE_DEVICE_H +#define PIPEWIRE_DEVICE_H #ifdef __cplusplus extern "C" { @@ -105,4 +105,4 @@ int pw_device_for_each_param(struct pw_device *device, } #endif -#endif /* __PIPEWIRE_DEVICE_H__ */ +#endif /* PIPEWIRE_DEVICE_H */ diff --git a/src/pipewire/factory.c b/src/pipewire/factory.c index abf460ed2..a45887306 100644 --- a/src/pipewire/factory.c +++ b/src/pipewire/factory.c @@ -26,9 +26,10 @@ #include -#include "pipewire/pipewire.h" #include "pipewire/factory.h" #include "pipewire/private.h" +#include "pipewire/type.h" +#include "pipewire/interfaces.h" struct resource_data { struct spa_hook resource_listener; diff --git a/src/pipewire/factory.h b/src/pipewire/factory.h index dd1ce5346..d583606c5 100644 --- a/src/pipewire/factory.h +++ b/src/pipewire/factory.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_FACTORY_H__ -#define __PIPEWIRE_FACTORY_H__ +#ifndef PIPEWIRE_FACTORY_H +#define PIPEWIRE_FACTORY_H #ifdef __cplusplus extern "C" { @@ -105,4 +105,4 @@ void *pw_factory_create_object(struct pw_factory *factory, } #endif -#endif /* __PIPEWIRE_FACTORY_H__ */ +#endif /* PIPEWIRE_FACTORY_H */ diff --git a/src/pipewire/global.c b/src/pipewire/global.c index a0ab22836..e550be874 100644 --- a/src/pipewire/global.c +++ b/src/pipewire/global.c @@ -27,9 +27,10 @@ #include #include -#include #include #include +#include +#include #include diff --git a/src/pipewire/global.h b/src/pipewire/global.h index 8f21ffb9c..3a1acddc5 100644 --- a/src/pipewire/global.h +++ b/src/pipewire/global.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_GLOBAL_H__ -#define __PIPEWIRE_GLOBAL_H__ +#ifndef PIPEWIRE_GLOBAL_H +#define PIPEWIRE_GLOBAL_H #ifdef __cplusplus extern "C" { @@ -143,4 +143,4 @@ void pw_global_destroy(struct pw_global *global); } #endif -#endif /* __PIPEWIRE_GLOBAL_H__ */ +#endif /* PIPEWIRE_GLOBAL_H */ diff --git a/src/pipewire/interfaces.h b/src/pipewire/interfaces.h index f44002f31..ab28b8368 100644 --- a/src/pipewire/interfaces.h +++ b/src/pipewire/interfaces.h @@ -22,14 +22,15 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_INTERFACES_H__ -#define __PIPEWIRE_INTERFACES_H__ +#ifndef PIPEWIRE_INTERFACES_H +#define PIPEWIRE_INTERFACES_H #ifdef __cplusplus extern "C" { #endif #include +#include #include #include @@ -895,4 +896,4 @@ pw_link_proxy_add_listener(struct pw_link_proxy *link, } /* extern "C" */ #endif -#endif /* __PIPEWIRE_INTERFACES_H__ */ +#endif /* PIPEWIRE_INTERFACES_H */ diff --git a/src/pipewire/introspect.h b/src/pipewire/introspect.h index dfb4187d6..8c21ce05a 100644 --- a/src/pipewire/introspect.h +++ b/src/pipewire/introspect.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_INTROSPECT_H__ -#define __PIPEWIRE_INTROSPECT_H__ +#ifndef PIPEWIRE_INTROSPECT_H +#define PIPEWIRE_INTROSPECT_H #include #include @@ -250,4 +250,4 @@ pw_link_info_free(struct pw_link_info *info); } #endif -#endif /* __PIPEWIRE_INTROSPECT_H__ */ +#endif /* PIPEWIRE_INTROSPECT_H */ diff --git a/src/pipewire/link.c b/src/pipewire/link.c index 2d96dee2a..2fe840dea 100644 --- a/src/pipewire/link.c +++ b/src/pipewire/link.c @@ -30,12 +30,12 @@ #include #include -#include "private.h" -#include "pipewire.h" -#include "interfaces.h" -#include "control.h" -#include "link.h" -#include "work-queue.h" +#include "pipewire/private.h" +#include "pipewire/interfaces.h" +#include "pipewire/control.h" +#include "pipewire/link.h" +#include "pipewire/type.h" +#include "pipewire/work-queue.h" #undef spa_debug #include diff --git a/src/pipewire/link.h b/src/pipewire/link.h index 85d1a3d50..45f3d4eaa 100644 --- a/src/pipewire/link.h +++ b/src/pipewire/link.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_LINK_H__ -#define __PIPEWIRE_LINK_H__ +#ifndef PIPEWIRE_LINK_H +#define PIPEWIRE_LINK_H #ifdef __cplusplus extern "C" { @@ -129,4 +129,4 @@ struct pw_link *pw_link_find(struct pw_port *output, struct pw_port *input); } #endif -#endif /* __PIPEWIRE_LINK_H__ */ +#endif /* PIPEWIRE_LINK_H */ diff --git a/src/pipewire/log.h b/src/pipewire/log.h index 99c0dba64..b7f92eb4e 100644 --- a/src/pipewire/log.h +++ b/src/pipewire/log.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_LOG_H__ -#define __PIPEWIRE_LOG_H__ +#ifndef PIPEWIRE_LOG_H +#define PIPEWIRE_LOG_H #include @@ -81,4 +81,4 @@ pw_log_logv(enum spa_log_level level, #ifdef __cplusplus } #endif -#endif /* __PIPEWIRE_LOG_H__ */ +#endif /* PIPEWIRE_LOG_H */ diff --git a/src/pipewire/loop.c b/src/pipewire/loop.c index b1ff09414..40da66a44 100644 --- a/src/pipewire/loop.c +++ b/src/pipewire/loop.c @@ -29,6 +29,7 @@ #include #include #include +#include #define DATAS_SIZE (4096 * 8) diff --git a/src/pipewire/loop.h b/src/pipewire/loop.h index aae94d4bd..bd87ad603 100644 --- a/src/pipewire/loop.h +++ b/src/pipewire/loop.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_LOOP_H__ -#define __PIPEWIRE_LOOP_H__ +#ifndef PIPEWIRE_LOOP_H +#define PIPEWIRE_LOOP_H #ifdef __cplusplus extern "C" { @@ -77,4 +77,4 @@ pw_loop_destroy(struct pw_loop *loop); } #endif -#endif /* __PIPEWIRE_LOOP_H__ */ +#endif /* PIPEWIRE_LOOP_H */ diff --git a/src/pipewire/main-loop.h b/src/pipewire/main-loop.h index f5e3b1345..6a72508d8 100644 --- a/src/pipewire/main-loop.h +++ b/src/pipewire/main-loop.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_MAIN_LOOP_H__ -#define __PIPEWIRE_MAIN_LOOP_H__ +#ifndef PIPEWIRE_MAIN_LOOP_H +#define PIPEWIRE_MAIN_LOOP_H #ifdef __cplusplus extern "C" { @@ -76,4 +76,4 @@ void pw_main_loop_quit(struct pw_main_loop *loop); } #endif -#endif /* __PIPEWIRE_MAIN_LOOP_H__ */ +#endif /* PIPEWIRE_MAIN_LOOP_H */ diff --git a/src/pipewire/map.h b/src/pipewire/map.h index 2e9acc7bf..1bee596ae 100644 --- a/src/pipewire/map.h +++ b/src/pipewire/map.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_MAP_H__ -#define __PIPEWIRE_MAP_H__ +#ifndef PIPEWIRE_MAP_H +#define PIPEWIRE_MAP_H #ifdef __cplusplus extern "C" { @@ -197,4 +197,4 @@ static inline int pw_map_for_each(struct pw_map *map, } /* extern "C" */ #endif -#endif /* __PIPEWIRE_MAP_H__ */ +#endif /* PIPEWIRE_MAP_H */ diff --git a/src/pipewire/mem.h b/src/pipewire/mem.h index 531904b32..afccb5d15 100644 --- a/src/pipewire/mem.h +++ b/src/pipewire/mem.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_MEM_H__ -#define __PIPEWIRE_MEM_H__ +#ifndef PIPEWIRE_MEM_H +#define PIPEWIRE_MEM_H #include @@ -95,4 +95,4 @@ static inline void pw_map_range_init(struct pw_map_range *range, } #endif -#endif /* __PIPEWIRE_MEM_H__ */ +#endif /* PIPEWIRE_MEM_H */ diff --git a/src/pipewire/module.c b/src/pipewire/module.c index b8ec1efbe..de77ead56 100644 --- a/src/pipewire/module.c +++ b/src/pipewire/module.c @@ -33,11 +33,11 @@ #include #include -#include "pipewire/pipewire.h" #include "pipewire/private.h" #include "pipewire/interfaces.h" #include "pipewire/utils.h" #include "pipewire/module.h" +#include "pipewire/type.h" /** \cond */ struct impl { diff --git a/src/pipewire/module.h b/src/pipewire/module.h index afeb2bb45..dea9b2361 100644 --- a/src/pipewire/module.h +++ b/src/pipewire/module.h @@ -23,8 +23,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_MODULE_H__ -#define __PIPEWIRE_MODULE_H__ +#ifndef PIPEWIRE_MODULE_H +#define PIPEWIRE_MODULE_H #ifdef __cplusplus extern "C" { @@ -106,4 +106,4 @@ void pw_module_destroy(struct pw_module *module); } #endif -#endif /* __PIPEWIRE_MODULE_H__ */ +#endif /* PIPEWIRE_MODULE_H */ diff --git a/src/pipewire/node.c b/src/pipewire/node.c index 3a6d886b3..183a41e17 100644 --- a/src/pipewire/node.c +++ b/src/pipewire/node.c @@ -30,13 +30,13 @@ #include -#include "pipewire/pipewire.h" #include "pipewire/interfaces.h" #include "pipewire/private.h" #include "pipewire/node.h" #include "pipewire/data-loop.h" #include "pipewire/main-loop.h" +#include "pipewire/type.h" #include "pipewire/work-queue.h" #ifndef spa_debug diff --git a/src/pipewire/node.h b/src/pipewire/node.h index bc772b796..532387616 100644 --- a/src/pipewire/node.h +++ b/src/pipewire/node.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_NODE_H__ -#define __PIPEWIRE_NODE_H__ +#ifndef PIPEWIRE_NODE_H +#define PIPEWIRE_NODE_H #ifdef __cplusplus extern "C" { @@ -43,6 +43,8 @@ extern "C" { */ struct pw_node; +#include + #include #include #include @@ -193,4 +195,4 @@ bool pw_node_is_enabled(struct pw_node *node); } #endif -#endif /* __PIPEWIRE_NODE_H__ */ +#endif /* PIPEWIRE_NODE_H */ diff --git a/src/pipewire/permission.h b/src/pipewire/permission.h index e6ae25eba..09ed4b6c7 100644 --- a/src/pipewire/permission.h +++ b/src/pipewire/permission.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PERMISSION_H__ -#define __PIPEWIRE_PERMISSION_H__ +#ifndef PIPEWIRE_PERMISSION_H +#define PIPEWIRE_PERMISSION_H #ifdef __cplusplus extern "C" { @@ -62,4 +62,4 @@ struct pw_permission { } #endif -#endif /* __PIPEWIRE_PERMISSION_H__ */ +#endif /* PIPEWIRE_PERMISSION_H */ diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c index 46e1a60e8..5445dadd8 100644 --- a/src/pipewire/pipewire.c +++ b/src/pipewire/pipewire.c @@ -39,7 +39,6 @@ #include "pipewire.h" #include "private.h" -#include "version.h" #define MAX_SUPPORT 32 @@ -618,16 +617,16 @@ const char* pw_get_library_version(void) } static const struct spa_type_info type_info[] = { - { PW_TYPE_INTERFACE_Core, PW_TYPE_INTERFACE_BASE "Core", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Registry, PW_TYPE_INTERFACE_BASE "Registry", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Node, PW_TYPE_INTERFACE_BASE "Node", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Port, PW_TYPE_INTERFACE_BASE "Port", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Factory, PW_TYPE_INTERFACE_BASE "Factory", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_BASE "Link", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Client, PW_TYPE_INTERFACE_BASE "Client", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Module, PW_TYPE_INTERFACE_BASE "Module", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_ClientNode, PW_TYPE_INTERFACE_BASE "ClientNode", SPA_TYPE_Pointer, NULL }, - { PW_TYPE_INTERFACE_Device, PW_TYPE_INTERFACE_BASE "Device", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Core, PW_TYPE_INFO_INTERFACE_BASE "Core", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Registry, PW_TYPE_INFO_INTERFACE_BASE "Registry", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Node, PW_TYPE_INFO_INTERFACE_BASE "Node", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Port, PW_TYPE_INFO_INTERFACE_BASE "Port", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Factory, PW_TYPE_INFO_INTERFACE_BASE "Factory", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Link, PW_TYPE_INFO_INTERFACE_BASE "Link", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Client, PW_TYPE_INFO_INTERFACE_BASE "Client", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Module, PW_TYPE_INFO_INTERFACE_BASE "Module", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_ClientNode, PW_TYPE_INFO_INTERFACE_BASE "ClientNode", SPA_TYPE_Pointer, NULL }, + { PW_TYPE_INTERFACE_Device, PW_TYPE_INFO_INTERFACE_BASE "Device", SPA_TYPE_Pointer, NULL }, { SPA_ID_INVALID, "spa_types", SPA_ID_INVALID, spa_types }, { 0, NULL, 0, NULL }, }; diff --git a/src/pipewire/pipewire.h b/src/pipewire/pipewire.h index a1f88a0e5..75e8d20a5 100644 --- a/src/pipewire/pipewire.h +++ b/src/pipewire/pipewire.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_H__ -#define __PIPEWIRE_H__ +#ifndef PIPEWIRE_H +#define PIPEWIRE_H #ifdef __cplusplus extern "C" { @@ -159,4 +159,4 @@ pw_get_support(uint32_t *n_support); } #endif -#endif /* __PIPEWIRE_H__ */ +#endif /* PIPEWIRE_H */ diff --git a/src/pipewire/port.c b/src/pipewire/port.c index f5056c0c7..cd3aaa6dd 100644 --- a/src/pipewire/port.c +++ b/src/pipewire/port.c @@ -30,8 +30,10 @@ #include #include "pipewire/pipewire.h" +#include "pipewire/interfaces.h" #include "pipewire/private.h" #include "pipewire/port.h" +#include "pipewire/link.h" /** \cond */ struct impl { diff --git a/src/pipewire/port.h b/src/pipewire/port.h index 5bbb5b529..6994fcd19 100644 --- a/src/pipewire/port.h +++ b/src/pipewire/port.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PORT_H__ -#define __PIPEWIRE_PORT_H__ +#ifndef PIPEWIRE_PORT_H +#define PIPEWIRE_PORT_H #ifdef __cplusplus extern "C" { @@ -113,4 +113,4 @@ void pw_port_add_listener(struct pw_port *port, } #endif -#endif /* __PIPEWIRE_PORT_H__ */ +#endif /* PIPEWIRE_PORT_H */ diff --git a/src/pipewire/private.h b/src/pipewire/private.h index dc7060ca8..c16c04e3a 100644 --- a/src/pipewire/private.h +++ b/src/pipewire/private.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PRIVATE_H__ -#define __PIPEWIRE_PRIVATE_H__ +#ifndef PIPEWIRE_PRIVATE_H +#define PIPEWIRE_PRIVATE_H #ifdef __cplusplus extern "C" { @@ -32,9 +32,11 @@ extern "C" { #include #include /* for pthread_t */ +#include "pipewire/map.h" +#include "pipewire/remote.h" #include "pipewire/mem.h" -#include "pipewire/pipewire.h" #include "pipewire/introspect.h" +#include "pipewire/stream.h" #include "pipewire/log.h" #ifndef spa_debug @@ -789,4 +791,4 @@ void pw_control_destroy(struct pw_control *control); } #endif -#endif /* __PIPEWIRE_PRIVATE_H__ */ +#endif /* PIPEWIRE_PRIVATE_H */ diff --git a/src/pipewire/properties.c b/src/pipewire/properties.c index 5312741f5..27951b087 100644 --- a/src/pipewire/properties.c +++ b/src/pipewire/properties.c @@ -23,8 +23,10 @@ */ #include +#include -#include "pipewire/pipewire.h" +#include "pipewire/array.h" +#include "pipewire/utils.h" #include "pipewire/properties.h" /** \cond */ diff --git a/src/pipewire/properties.h b/src/pipewire/properties.h index eeefcacf1..cb2450787 100644 --- a/src/pipewire/properties.h +++ b/src/pipewire/properties.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PROPERTIES_H__ -#define __PIPEWIRE_PROPERTIES_H__ +#ifndef PIPEWIRE_PROPERTIES_H +#define PIPEWIRE_PROPERTIES_H #ifdef __cplusplus extern "C" { @@ -109,4 +109,4 @@ static inline double pw_properties_parse_double(const char *value) { } #endif -#endif /* __PIPEWIRE_PROPERTIES_H__ */ +#endif /* PIPEWIRE_PROPERTIES_H */ diff --git a/src/pipewire/protocol.c b/src/pipewire/protocol.c index 768c06849..b9b7e8d5d 100644 --- a/src/pipewire/protocol.c +++ b/src/pipewire/protocol.c @@ -28,6 +28,7 @@ #include #include +#include /** \cond */ struct impl { diff --git a/src/pipewire/protocol.h b/src/pipewire/protocol.h index ed1d941b2..f5a7b7aa6 100644 --- a/src/pipewire/protocol.h +++ b/src/pipewire/protocol.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PROTOCOL_H__ -#define __PIPEWIRE_PROTOCOL_H__ +#ifndef PIPEWIRE_PROTOCOL_H +#define PIPEWIRE_PROTOCOL_H #ifdef __cplusplus extern "C" { @@ -37,8 +37,8 @@ struct pw_protocol; #include #include -#define PW_TYPE__Protocol "PipeWire:Protocol" -#define PW_TYPE_PROTOCOL_BASE PW_TYPE__Protocol ":" +#define PW_TYPE_INFO_Protocol "PipeWire:Protocol" +#define PW_TYPE_INFO_PROTOCOL_BASE PW_TYPE_INFO_Protocol ":" struct pw_protocol_client { struct spa_list link; /**< link in protocol client_list */ @@ -140,4 +140,4 @@ struct pw_protocol * pw_core_find_protocol(struct pw_core *core, const char *nam } /* extern "C" */ #endif -#endif /* __PIPEWIRE_PROTOCOL_H__ */ +#endif /* PIPEWIRE_PROTOCOL_H */ diff --git a/src/pipewire/proxy.c b/src/pipewire/proxy.c index fa3100300..1ff7199dc 100644 --- a/src/pipewire/proxy.c +++ b/src/pipewire/proxy.c @@ -27,6 +27,7 @@ #include #include #include +#include #include diff --git a/src/pipewire/proxy.h b/src/pipewire/proxy.h index a8bdaf5d2..604030e8d 100644 --- a/src/pipewire/proxy.h +++ b/src/pipewire/proxy.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_PROXY_H__ -#define __PIPEWIRE_PROXY_H__ +#ifndef PIPEWIRE_PROXY_H +#define PIPEWIRE_PROXY_H #ifdef __cplusplus extern "C" { @@ -157,4 +157,4 @@ const struct pw_protocol_marshal *pw_proxy_get_marshal(struct pw_proxy *proxy); } #endif -#endif /* __PIPEWIRE_PROXY_H__ */ +#endif /* PIPEWIRE_PROXY_H */ diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c index 00a286a6c..377794f08 100644 --- a/src/pipewire/remote.c +++ b/src/pipewire/remote.c @@ -34,12 +34,6 @@ #include "pipewire/pipewire.h" #include "pipewire/private.h" -#include "pipewire/introspect.h" -#include "pipewire/interfaces.h" -#include "pipewire/remote.h" -#include "pipewire/core.h" -#include "pipewire/module.h" -#include "pipewire/stream.h" #include "extensions/protocol-native.h" #include "extensions/client-node.h" @@ -231,7 +225,7 @@ struct pw_remote *pw_remote_new(struct pw_core *core, if (!pw_module_load(core, "libpipewire-module-protocol-native", NULL, NULL, NULL, NULL)) goto no_protocol; - protocol_name = PW_TYPE_PROTOCOL__Native; + protocol_name = PW_TYPE_INFO_PROTOCOL_Native; } protocol = pw_core_find_protocol(core, protocol_name); diff --git a/src/pipewire/remote.h b/src/pipewire/remote.h index f53458f05..50e8a7e30 100644 --- a/src/pipewire/remote.h +++ b/src/pipewire/remote.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_REMOTE_H__ -#define __PIPEWIRE_REMOTE_H__ +#ifndef PIPEWIRE_REMOTE_H +#define PIPEWIRE_REMOTE_H #ifdef __cplusplus extern "C" { @@ -113,7 +113,7 @@ struct pw_remote; #include #include -#include +#include #include /** \enum pw_remote_state The state of a \ref pw_remote \memberof pw_remote */ @@ -209,4 +209,4 @@ struct pw_proxy *pw_remote_export(struct pw_remote *remote, struct pw_node *node } #endif -#endif /* __PIPEWIRE_REMOTE_H__ */ +#endif /* PIPEWIRE_REMOTE_H */ diff --git a/src/pipewire/resource.c b/src/pipewire/resource.c index 4e0e68b25..6294d1aaa 100644 --- a/src/pipewire/resource.c +++ b/src/pipewire/resource.c @@ -28,6 +28,7 @@ #include "pipewire/private.h" #include "pipewire/protocol.h" #include "pipewire/resource.h" +#include "pipewire/type.h" #include diff --git a/src/pipewire/resource.h b/src/pipewire/resource.h index bc4cf6c99..479702501 100644 --- a/src/pipewire/resource.h +++ b/src/pipewire/resource.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_RESOURCE_H__ -#define __PIPEWIRE_RESOURCE_H__ +#ifndef PIPEWIRE_RESOURCE_H +#define PIPEWIRE_RESOURCE_H #ifdef __cplusplus extern "C" { @@ -138,4 +138,4 @@ const struct pw_protocol_marshal *pw_resource_get_marshal(struct pw_resource *re } #endif -#endif /* __PIPEWIRE_RESOURCE_H__ */ +#endif /* PIPEWIRE_RESOURCE_H */ diff --git a/src/pipewire/stream.h b/src/pipewire/stream.h index 03a6ade8c..c225bd8e8 100644 --- a/src/pipewire/stream.h +++ b/src/pipewire/stream.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_STREAM_H__ -#define __PIPEWIRE_STREAM_H__ +#ifndef PIPEWIRE_STREAM_H +#define PIPEWIRE_STREAM_H #ifdef __cplusplus extern "C" { @@ -357,4 +357,4 @@ int pw_stream_flush(struct pw_stream *stream, bool drain); } #endif -#endif /* __PIPEWIRE_STREAM_H__ */ +#endif /* PIPEWIRE_STREAM_H */ diff --git a/src/pipewire/thread-loop.c b/src/pipewire/thread-loop.c index 9deda296a..d3f5234b2 100644 --- a/src/pipewire/thread-loop.c +++ b/src/pipewire/thread-loop.c @@ -26,7 +26,7 @@ #include #include -#include "pipewire.h" +#include "log.h" #include "thread-loop.h" #define pw_thread_loop_events_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_thread_loop_events, m, v, ##__VA_ARGS__) diff --git a/src/pipewire/thread-loop.h b/src/pipewire/thread-loop.h index f6134f885..00c71b838 100644 --- a/src/pipewire/thread-loop.h +++ b/src/pipewire/thread-loop.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_THREAD_LOOP_H__ -#define __PIPEWIRE_THREAD_LOOP_H__ +#ifndef PIPEWIRE_THREAD_LOOP_H +#define PIPEWIRE_THREAD_LOOP_H #ifdef __cplusplus extern "C" { @@ -151,4 +151,4 @@ bool pw_thread_loop_in_thread(struct pw_thread_loop *loop); } #endif -#endif /* __PIPEWIRE_THREAD_LOOP_H__ */ +#endif /* PIPEWIRE_THREAD_LOOP_H */ diff --git a/src/pipewire/type.h b/src/pipewire/type.h index 9902e6b47..3a50b3ce5 100644 --- a/src/pipewire/type.h +++ b/src/pipewire/type.h @@ -22,20 +22,14 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_TYPE_H__ -#define __PIPEWIRE_TYPE_H__ +#ifndef PIPEWIRE_TYPE_H +#define PIPEWIRE_TYPE_H #ifdef __cplusplus extern "C" { #endif -#include -#include -#include -#include -#include - -#include +#include enum { PW_TYPE_FIRST = SPA_TYPE_VENDOR_PipeWire, @@ -53,13 +47,13 @@ enum { }; -#define PW_TYPE_BASE "PipeWire:" +#define PW_TYPE_INFO_BASE "PipeWire:" -#define PW_TYPE__Object PW_TYPE_BASE "Object" -#define PW_TYPE_OBJECT_BASE PW_TYPE__Object ":" +#define PW_TYPE_INFO_Object PW_TYPE_INFO_BASE "Object" +#define PW_TYPE_INFO_OBJECT_BASE PW_TYPE_INFO_Object ":" -#define PW_TYPE__Interface PW_TYPE_BASE "Interface" -#define PW_TYPE_INTERFACE_BASE PW_TYPE__Interface ":" +#define PW_TYPE_INFO_Interface PW_TYPE_INFO_BASE "Interface" +#define PW_TYPE_INFO_INTERFACE_BASE PW_TYPE_INFO_Interface ":" const struct spa_type_info * pw_type_info(void); @@ -67,4 +61,4 @@ const struct spa_type_info * pw_type_info(void); } #endif -#endif /* __PIPEWIRE_TYPE_H__ */ +#endif /* PIPEWIRE_TYPE_H */ diff --git a/src/pipewire/utils.h b/src/pipewire/utils.h index fe17d3dce..ad542f4d2 100644 --- a/src/pipewire/utils.h +++ b/src/pipewire/utils.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_UTILS_H__ -#define __PIPEWIRE_UTILS_H__ +#ifndef PIPEWIRE_UTILS_H +#define PIPEWIRE_UTILS_H #ifdef __cplusplus extern "C" { @@ -70,4 +70,4 @@ pw_spa_pod_copy(const struct spa_pod *pod) } /* extern "C" */ #endif -#endif /* __PIPEWIRE_UTILS_H__ */ +#endif /* PIPEWIRE_UTILS_H */ diff --git a/src/pipewire/version.h.in b/src/pipewire/version.h.in index 381c93665..52b0b1f65 100644 --- a/src/pipewire/version.h.in +++ b/src/pipewire/version.h.in @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_VERSION_H__ -#define __PIPEWIRE_VERSION_H__ +#ifndef PIPEWIRE_VERSION_H +#define PIPEWIRE_VERSION_H /* WARNING: Make sure to edit the real source file version.h.in! */ @@ -65,4 +65,4 @@ const char* pw_get_library_version(void); } #endif -#endif /* __PIPEWIRE_VERION_H__ */ +#endif /* PIPEWIRE_VERION_H */ diff --git a/src/pipewire/work-queue.h b/src/pipewire/work-queue.h index 0320a1c02..da2099efd 100644 --- a/src/pipewire/work-queue.h +++ b/src/pipewire/work-queue.h @@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef __PIPEWIRE_WORK_QUEUE_H__ -#define __PIPEWIRE_WORK_QUEUE_H__ +#ifndef PIPEWIRE_WORK_QUEUE_H +#define PIPEWIRE_WORK_QUEUE_H #ifdef __cplusplus extern "C" { @@ -60,4 +60,4 @@ pw_work_queue_complete(struct pw_work_queue *queue, void *obj, uint32_t seq, int } #endif -#endif /* __PIPEWIRE_WORK_QUEUE_H__ */ +#endif /* PIPEWIRE_WORK_QUEUE_H */ diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c index b0188a464..a607760f2 100644 --- a/src/tools/pipewire-cli.c +++ b/src/tools/pipewire-cli.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c index 37d650875..db0849972 100644 --- a/src/tools/pipewire-monitor.c +++ b/src/tools/pipewire-monitor.c @@ -29,9 +29,11 @@ #include #include -#include #include #include +#include +#include +#include struct proxy_data;