diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2006-10-09 07:01:19 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2006-10-09 07:01:19 +0000 |
| commit | b26667c5b277141fa3a87d3ebca007b3e4d0ff7e (patch) | |
| tree | a5d572978035ed62605c1d7cf6ab7f81de23ed06 /sys | |
| parent | 2e181110000ffc4c076b8b904c45b104dfafdd89 (diff) | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/v4l2/gstv4l2xoverlay.c | 7 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2xoverlay.h | 40 |
2 files changed, 22 insertions, 25 deletions
diff --git a/sys/v4l2/gstv4l2xoverlay.c b/sys/v4l2/gstv4l2xoverlay.c index 5a07e510..5ac30206 100644 --- a/sys/v4l2/gstv4l2xoverlay.c +++ b/sys/v4l2/gstv4l2xoverlay.c @@ -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; diff --git a/sys/v4l2/gstv4l2xoverlay.h b/sys/v4l2/gstv4l2xoverlay.h index 8eac0e2c..3d15ce90 100644 --- a/sys/v4l2/gstv4l2xoverlay.h +++ b/sys/v4l2/gstv4l2xoverlay.h @@ -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__ */ |