Commit b26667c5 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

sys/v4l2/gstv4l2xoverlay.*: Fix build as per the patch in #338818 comment 36.

Original commit message from CVS:
* sys/v4l2/gstv4l2xoverlay.c:
* sys/v4l2/gstv4l2xoverlay.h:
Fix build as per the patch in #338818 comment 36.
parent 2e181110
2006-10-09 Jan Schmidt <thaytan@mad.scientist.com>
* sys/v4l2/gstv4l2xoverlay.c:
* sys/v4l2/gstv4l2xoverlay.h:
Fix build as per the patch in #338818 comment 36.
2006-10-07 Tim-Philipp Müller <tim at centricular dot net>
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_stream_configure_transport):
......
......@@ -47,11 +47,6 @@ struct _GstV4l2Xv
GST_DEBUG_CATEGORY_STATIC (v4l2xv_debug);
#define GST_CAT_DEFAULT v4l2xv_debug
static void gst_v4l2_xoverlay_set_xwindow_id (GstV4l2Object * v4l2object,
XID xwindow_id);
void
gst_v4l2_xoverlay_interface_init (GstXOverlayClass * klass)
{
......@@ -193,7 +188,7 @@ idle_refresh (gpointer data)
return FALSE;
}
static void
void
gst_v4l2_xoverlay_set_xwindow_id (GstV4l2Object * v4l2object, XID xwindow_id)
{
GstV4l2Xv *v4l2xv;
......
......@@ -37,26 +37,28 @@ void gst_v4l2_xoverlay_start (GstV4l2Object *v4l2object);
void gst_v4l2_xoverlay_stop (GstV4l2Object *v4l2object);
void gst_v4l2_xoverlay_interface_init (GstXOverlayClass * klass);
void gst_v4l2_xoverlay_set_xwindow_id (GstV4l2Object * v4l2object,
XID xwindow_id);
#define GST_IMPLEMENT_V4L2_XOVERLAY_METHODS(Type, interface_as_function) \
\
static void \
interface_as_function ## _xoverlay_set_xwindow_id (GstXOverlay * xoverlay, \
XID xwindow_id) \
{ \
Type *this = (Type*) xoverlay; \
gst_v4l2_xoverlay_set_xwindow_id (this->v4l2object, xwindow_id); \
} \
\
static void \
interface_as_function ## _xoverlay_interface_init (GstXOverlayClass * klass) \
{ \
/* default virtual functions */ \
klass->set_xwindow_id = interface_as_function ## _xoverlay_set_xwindow_id; \
\
gst_v4l2_xoverlay_interface_init(GstXOverlayClass * klass); \
} \
\
#define GST_IMPLEMENT_V4L2_XOVERLAY_METHODS(Type, interface_as_function) \
\
static void \
interface_as_function ## _xoverlay_set_xwindow_id (GstXOverlay * xoverlay, \
XID xwindow_id) \
{ \
Type *this = (Type*) xoverlay; \
gst_v4l2_xoverlay_set_xwindow_id (this->v4l2object, xwindow_id); \
} \
\
static void \
interface_as_function ## _xoverlay_interface_init (GstXOverlayClass * klass) \
{ \
/* default virtual functions */ \
klass->set_xwindow_id = interface_as_function ## _xoverlay_set_xwindow_id; \
\
gst_v4l2_xoverlay_interface_init(klass); \
} \
#endif /* __GST_V4L2_X_OVERLAY_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment