diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-11-02 17:02:51 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-11-02 17:02:51 +0000 |
| commit | c75664e083f7dbf183d2ff1e80139775fb2b7711 (patch) | |
| tree | cd8cd221d29b86459164e98ea2ced306669ebdd0 /sys/v4l2/gstv4l2element.c | |
| parent | eabfbf13fc047855e176732caad160f4f12d1fe0 (diff) | |
| download | gst-plugins-bad-c75664e083f7dbf183d2ff1e80139775fb2b7711.tar.gz gst-plugins-bad-c75664e083f7dbf183d2ff1e80139775fb2b7711.tar.bz2 gst-plugins-bad-c75664e083f7dbf183d2ff1e80139775fb2b7711.zip | |
hmm...
Original commit message from CVS:
hmm...
Diffstat (limited to 'sys/v4l2/gstv4l2element.c')
| -rw-r--r-- | sys/v4l2/gstv4l2element.c | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c index 35f06290..45ae11c8 100644 --- a/sys/v4l2/gstv4l2element.c +++ b/sys/v4l2/gstv4l2element.c @@ -30,11 +30,8 @@ static GstElementDetails gst_v4l2element_details = { "Generic video4linux2 Element", "Generic/Video", - "LGPL", "Generic plugin for handling common video4linux2 calls", - VERSION, - "Ronald Bultje <rbultje@ronald.bitfreak.net>", - "(C) 2002", + "Ronald Bultje <rbultje@ronald.bitfreak.net>" }; /* V4l2Element signals and args */ @@ -54,6 +51,7 @@ enum { static void gst_v4l2element_class_init (GstV4l2ElementClass *klass); +static void gst_v4l2element_base_init (GstV4l2ElementClass *klass); static void gst_v4l2element_init (GstV4l2Element *v4lelement); static void gst_v4l2element_dispose (GObject *object); static void gst_v4l2element_set_property (GObject *object, @@ -109,7 +107,7 @@ gst_v4l2element_get_type (void) if (!v4l2element_type) { static const GTypeInfo v4l2element_info = { sizeof(GstV4l2ElementClass), - NULL, + (GBaseInitFunc) gst_v4l2element_base_init, NULL, (GClassInitFunc) gst_v4l2element_class_init, NULL, @@ -191,6 +189,14 @@ gst_v4l2_device_get_type (void) return v4l2_device_type; } +static void +gst_v4l2element_base_init (GstV4l2ElementClass *klass) +{ + GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_set_details (gstelement_class, + &gst_v4l2element_details); +} static void gst_v4l2element_class_init (GstV4l2ElementClass *klass) @@ -381,22 +387,3 @@ gst_v4l2element_change_state (GstElement *element) return GST_STATE_SUCCESS; } - - -gboolean -gst_v4l2element_factory_init (GstPlugin *plugin) -{ - GstElementFactory *factory; - - /* we can run without... But not yet. ;). */ - if (!gst_library_load ("xwindowlistener")) - return FALSE; - - /* create an elementfactory for the v4l2element */ - factory = gst_element_factory_new("v4l2element", GST_TYPE_V4L2ELEMENT, - &gst_v4l2element_details); - g_return_val_if_fail(factory != NULL, FALSE); - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); - - return TRUE; -} |