diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-25 08:51:15 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-25 08:51:15 +0000 |
| commit | 8033e68ba9ff2469b7d41ea0e7566fa6a0ee1533 (patch) | |
| tree | 21932e495799edf213be9e8b30c2e7317637e6f6 /sys/v4l2/gstv4l2element.h | |
| parent | b41cdefc0551d263c84abb2186ee34ca4d4a9ef6 (diff) | |
sys/: Remove client-side overlay handling, use the X-server v4l plugin for that. Nicer overlay, less code. Also make ...
Original commit message from CVS:
* sys/v4l/Makefile.am:
* sys/v4l/gstv4l.c: (plugin_init):
* sys/v4l/gstv4lelement.c: (gst_v4lelement_get_type),
(gst_v4lelement_init), (gst_v4lelement_dispose),
(gst_v4lelement_change_state):
* sys/v4l/gstv4lelement.h:
* sys/v4l/gstv4lxoverlay.c: (gst_v4l_xoverlay_open),
(gst_v4l_xoverlay_close), (idle_refresh),
(gst_v4l_xoverlay_set_xwindow_id):
* sys/v4l/gstv4lxoverlay.h:
* sys/v4l/v4l-overlay_calls.c:
* sys/v4l/v4l_calls.h:
* sys/v4l2/Makefile.am:
* sys/v4l2/gstv4l2.c: (plugin_init):
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_type),
(gst_v4l2element_init), (gst_v4l2element_dispose),
(gst_v4l2element_change_state):
* sys/v4l2/gstv4l2element.h:
* sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open),
(gst_v4l2_xoverlay_close), (idle_refresh),
(gst_v4l2_xoverlay_set_xwindow_id):
* sys/v4l2/gstv4l2xoverlay.h:
* sys/v4l2/v4l2-overlay_calls.c:
* sys/v4l2/v4l2_calls.h:
Remove client-side overlay handling, use the X-server v4l plugin
for that. Nicer overlay, less code. Also make the plugin
compileable without X (but then without overlay, obviously).
Makes xwindowlistener obsolete, should we remove that?
Diffstat (limited to 'sys/v4l2/gstv4l2element.h')
| -rw-r--r-- | sys/v4l2/gstv4l2element.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/v4l2/gstv4l2element.h b/sys/v4l2/gstv4l2element.h index 0fadf068..c9e5f347 100644 --- a/sys/v4l2/gstv4l2element.h +++ b/sys/v4l2/gstv4l2element.h @@ -88,6 +88,7 @@ struct v4l2_buffer typedef struct _GstV4l2Element GstV4l2Element; typedef struct _GstV4l2ElementClass GstV4l2ElementClass; +typedef struct _GstV4l2Xv GstV4l2Xv; struct _GstV4l2Element { GstElement element; @@ -110,16 +111,13 @@ struct _GstV4l2Element { GList *colors; /* X-overlay */ - GstXWindowListener *overlay; + GstV4l2Xv *xv; XID xwindow_id; /* properties */ gchar *norm; gchar *channel; gulong frequency; - - /* caching values */ - gchar *display; }; struct _GstV4l2ElementClass { |