allocators: GST_EXPORT -> GST_ALLOCATORS_API

We need different export decorators for the different libs.
For now no actual change though, just rename before the release,
and add prelude headers to define the new decorator to GST_EXPORT.
This commit is contained in:
Tim-Philipp Müller 2018-03-13 10:19:16 +00:00
parent e9be107e4a
commit 75c32b8afc
7 changed files with 50 additions and 13 deletions

View file

@ -4,6 +4,7 @@ libgstallocators_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API
libgstallocators_@GST_API_VERSION@_include_HEADERS = \
allocators.h \
allocators-prelude.h \
gstfdmemory.h \
gstphysmemory.h \
gstdmabuf.h

View file

@ -0,0 +1,31 @@
/* GStreamer Allocators Library
* Copyright (C) 2018 GStreamer developers
*
* allocators-prelude.h: prelude include header for gst-allocators library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_ALLOCATORS_PRELUDE_H__
#define __GST_ALLOCATORS_PRELUDE_H__
#include <gst/gst.h>
#ifndef GST_ALLOCATORS_API
#define GST_ALLOCATORS_API GST_EXPORT
#endif
#endif /* __GST_ALLOCATORS_PRELUDE_H__ */

View file

@ -22,6 +22,8 @@
#ifndef __GST_ALLOCATORS_H__
#define __GST_ALLOCATORS_H__
#include <gst/allocators/allocators-prelude.h>
#include <gst/allocators/gstdmabuf.h>
#include <gst/allocators/gstfdmemory.h>
#include <gst/allocators/gstphysmemory.h>

View file

@ -95,19 +95,19 @@ struct _GstDmaBufAllocatorClass
};
GST_EXPORT
GST_ALLOCATORS_API
GType gst_dmabuf_allocator_get_type (void);
GST_EXPORT
GST_ALLOCATORS_API
GstAllocator * gst_dmabuf_allocator_new (void);
GST_EXPORT
GST_ALLOCATORS_API
GstMemory * gst_dmabuf_allocator_alloc (GstAllocator * allocator, gint fd, gsize size);
GST_EXPORT
GST_ALLOCATORS_API
gint gst_dmabuf_memory_get_fd (GstMemory * mem);
GST_EXPORT
GST_ALLOCATORS_API
gboolean gst_is_dmabuf_memory (GstMemory * mem);

View file

@ -22,6 +22,7 @@
#define __GST_FD_ALLOCATOR_H__
#include <gst/gst.h>
#include <gst/allocators/allocators-prelude.h>
G_BEGIN_DECLS
@ -76,20 +77,20 @@ struct _GstFdAllocatorClass
GstAllocatorClass parent_class;
};
GST_EXPORT
GST_ALLOCATORS_API
GType gst_fd_allocator_get_type (void);
GST_EXPORT
GST_ALLOCATORS_API
GstAllocator * gst_fd_allocator_new (void);
GST_EXPORT
GST_ALLOCATORS_API
GstMemory * gst_fd_allocator_alloc (GstAllocator * allocator, gint fd,
gsize size, GstFdMemoryFlags flags);
GST_EXPORT
GST_ALLOCATORS_API
gboolean gst_is_fd_memory (GstMemory *mem);
GST_EXPORT
GST_ALLOCATORS_API
gint gst_fd_memory_get_fd (GstMemory *mem);
#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC

View file

@ -21,6 +21,7 @@
#define __GST_PHYS_MEMORY_H__
#include <gst/gst.h>
#include <gst/allocators/allocators-prelude.h>
G_BEGIN_DECLS
@ -49,13 +50,13 @@ struct _GstPhysMemoryAllocatorInterface
guintptr (*get_phys_addr) (GstPhysMemoryAllocator * allocator, GstMemory * mem);
};
GST_EXPORT
GST_ALLOCATORS_API
GType gst_phys_memory_allocator_get_type (void);
GST_EXPORT
GST_ALLOCATORS_API
gboolean gst_is_phys_memory (GstMemory *mem);
GST_EXPORT
GST_ALLOCATORS_API
guintptr gst_phys_memory_get_phys_addr (GstMemory * mem);
G_END_DECLS

View file

@ -1,5 +1,6 @@
gst_allocators_headers = [
'allocators.h',
'allocators-prelude.h',
'gstfdmemory.h',
'gstphysmemory.h',
'gstdmabuf.h',