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

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

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

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

6
spa/include/spa/buffer/alloc.h
View file

@ -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 */

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

@ -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 */

6
spa/include/spa/buffer/meta.h
View file

@ -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 */

46
spa/include/spa/buffer/type-info.h
View file

@ -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 <spa/buffer/meta.h>
#include <spa/utils/type.h>
#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 */