From eb8ab3732e0abb0e364b99037819b8ce1b337b88 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Tue, 4 Feb 2014 16:32:31 +0100 Subject: [PATCH] waylandsink: tidy up the header files --- ext/wayland/gstwaylandsink.h | 4 ++++ ext/wayland/waylandpool.h | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h index cb3383e..9e9b011 100644 --- a/ext/wayland/gstwaylandsink.h +++ b/ext/wayland/gstwaylandsink.h @@ -42,6 +42,8 @@ #include +G_BEGIN_DECLS + #define GST_TYPE_WAYLAND_SINK \ (gst_wayland_sink_get_type()) #define GST_WAYLAND_SINK(obj) \ @@ -87,7 +89,9 @@ struct shm_pool { typedef struct _GstWaylandSink GstWaylandSink; typedef struct _GstWaylandSinkClass GstWaylandSinkClass; +G_END_DECLS #include "waylandpool.h" +G_BEGIN_DECLS struct _GstWaylandSink { diff --git a/ext/wayland/waylandpool.h b/ext/wayland/waylandpool.h index 4089da0..8657e14 100644 --- a/ext/wayland/waylandpool.h +++ b/ext/wayland/waylandpool.h @@ -21,16 +21,16 @@ #ifndef __GST_WAYLAND_BUFFER_POOL_H__ #define __GST_WAYLAND_BUFFER_POOL_H__ +#include "gstwaylandsink.h" + G_BEGIN_DECLS -#include "gstwaylandsink.h" +/* buffer meta */ typedef struct _GstWlMeta GstWlMeta; -typedef struct _GstWaylandBufferPool GstWaylandBufferPool; -typedef struct _GstWaylandBufferPoolClass GstWaylandBufferPoolClass; - GType gst_wl_meta_api_get_type (void); #define GST_WL_META_API_TYPE (gst_wl_meta_api_get_type()) + const GstMetaInfo * gst_wl_meta_get_info (void); #define GST_WL_META_INFO (gst_wl_meta_get_info()) @@ -46,12 +46,15 @@ struct _GstWlMeta { size_t size; }; -/* buffer pool functions */ +/* buffer pool */ #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_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)) +typedef struct _GstWaylandBufferPool GstWaylandBufferPool; +typedef struct _GstWaylandBufferPoolClass GstWaylandBufferPoolClass; + struct _GstWaylandBufferPool { GstBufferPool bufferpool; -- 2.7.4