From 735bf63063d9dffd81f43f06479d94369fee21e0 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 25 Apr 2013 18:38:17 +0100 Subject: [PATCH] cogl-gst: Move the PARAM macros into the C file These are just internal convenience macros to define the GObject properties so they shouldn't be in the public headers. Reviewed-by: Robert Bragg (cherry picked from commit b7b861aa87ad05a2c253afdd87323acd82fd988f) --- cogl-gst/cogl-gst-video-sink.c | 12 ++++++++++++ cogl-gst/cogl-gst-video-sink.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c index 62981d8da..6e6540202 100644 --- a/cogl-gst/cogl-gst-video-sink.c +++ b/cogl-gst/cogl-gst-video-sink.c @@ -58,6 +58,18 @@ #define SINK_CAPS GST_VIDEO_CAPS_MAKE (BASE_SINK_CAPS) +#define COGL_GST_PARAM_STATIC \ + (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) + +#define COGL_GST_PARAM_READABLE \ + (G_PARAM_READABLE | COGL_GST_PARAM_STATIC) + +#define COGL_GST_PARAM_WRITABLE \ + (G_PARAM_WRITABLE | COGL_GST_PARAM_STATIC) + +#define COGL_GST_PARAM_READWRITE \ + (G_PARAM_READABLE | G_PARAM_WRITABLE | COGL_GST_PARAM_STATIC) + static GstStaticPadTemplate sinktemplate_all = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/cogl-gst/cogl-gst-video-sink.h b/cogl-gst/cogl-gst-video-sink.h index cabc50224..e76e74230 100644 --- a/cogl-gst/cogl-gst-video-sink.h +++ b/cogl-gst/cogl-gst-video-sink.h @@ -101,18 +101,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), \ COGL_GST_TYPE_VIDEO_SINK, CoglGstVideoSinkClass)) -#define COGL_GST_PARAM_STATIC \ - (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) - -#define COGL_GST_PARAM_READABLE \ - (G_PARAM_READABLE | COGL_GST_PARAM_STATIC) - -#define COGL_GST_PARAM_WRITABLE \ - (G_PARAM_WRITABLE | COGL_GST_PARAM_STATIC) - -#define COGL_GST_PARAM_READWRITE \ - (G_PARAM_READABLE | G_PARAM_WRITABLE | COGL_GST_PARAM_STATIC) - typedef struct _CoglGstVideoSink CoglGstVideoSink; typedef struct _CoglGstVideoSinkClass CoglGstVideoSinkClass; typedef struct _CoglGstVideoSinkPrivate CoglGstVideoSinkPrivate;