waylandsink: tidy up the header files

This commit is contained in:
George Kiagiadakis 2014-02-04 16:32:31 +01:00
parent 310fe9f780
commit eb8ab3732e
2 changed files with 12 additions and 5 deletions

View file

@ -42,6 +42,8 @@
#include <wayland-client.h> #include <wayland-client.h>
G_BEGIN_DECLS
#define GST_TYPE_WAYLAND_SINK \ #define GST_TYPE_WAYLAND_SINK \
(gst_wayland_sink_get_type()) (gst_wayland_sink_get_type())
#define GST_WAYLAND_SINK(obj) \ #define GST_WAYLAND_SINK(obj) \
@ -87,7 +89,9 @@ struct shm_pool {
typedef struct _GstWaylandSink GstWaylandSink; typedef struct _GstWaylandSink GstWaylandSink;
typedef struct _GstWaylandSinkClass GstWaylandSinkClass; typedef struct _GstWaylandSinkClass GstWaylandSinkClass;
G_END_DECLS
#include "waylandpool.h" #include "waylandpool.h"
G_BEGIN_DECLS
struct _GstWaylandSink struct _GstWaylandSink
{ {

View file

@ -21,16 +21,16 @@
#ifndef __GST_WAYLAND_BUFFER_POOL_H__ #ifndef __GST_WAYLAND_BUFFER_POOL_H__
#define __GST_WAYLAND_BUFFER_POOL_H__ #define __GST_WAYLAND_BUFFER_POOL_H__
#include "gstwaylandsink.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#include "gstwaylandsink.h" /* buffer meta */
typedef struct _GstWlMeta GstWlMeta; typedef struct _GstWlMeta GstWlMeta;
typedef struct _GstWaylandBufferPool GstWaylandBufferPool;
typedef struct _GstWaylandBufferPoolClass GstWaylandBufferPoolClass;
GType gst_wl_meta_api_get_type (void); GType gst_wl_meta_api_get_type (void);
#define GST_WL_META_API_TYPE (gst_wl_meta_api_get_type()) #define GST_WL_META_API_TYPE (gst_wl_meta_api_get_type())
const GstMetaInfo * gst_wl_meta_get_info (void); const GstMetaInfo * gst_wl_meta_get_info (void);
#define GST_WL_META_INFO (gst_wl_meta_get_info()) #define GST_WL_META_INFO (gst_wl_meta_get_info())
@ -46,12 +46,15 @@ struct _GstWlMeta {
size_t size; size_t size;
}; };
/* buffer pool functions */ /* buffer pool */
#define GST_TYPE_WAYLAND_BUFFER_POOL (gst_wayland_buffer_pool_get_type()) #define GST_TYPE_WAYLAND_BUFFER_POOL (gst_wayland_buffer_pool_get_type())
#define GST_IS_WAYLAND_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_WAYLAND_BUFFER_POOL)) #define GST_IS_WAYLAND_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_WAYLAND_BUFFER_POOL))
#define GST_WAYLAND_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_WAYLAND_BUFFER_POOL, GstWaylandBufferPool)) #define GST_WAYLAND_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_WAYLAND_BUFFER_POOL, GstWaylandBufferPool))
#define GST_WAYLAND_BUFFER_POOL_CAST(obj) ((GstWaylandBufferPool*)(obj)) #define GST_WAYLAND_BUFFER_POOL_CAST(obj) ((GstWaylandBufferPool*)(obj))
typedef struct _GstWaylandBufferPool GstWaylandBufferPool;
typedef struct _GstWaylandBufferPoolClass GstWaylandBufferPoolClass;
struct _GstWaylandBufferPool struct _GstWaylandBufferPool
{ {
GstBufferPool bufferpool; GstBufferPool bufferpool;