diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-05-26 23:39:55 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-05-28 08:27:54 +0100 |
| commit | 61f1a5a00c500e212976a4f7f82076f21ebcdd7f (patch) | |
| tree | 354822533fee75a43b2797772efc3b51f589ea4b /clutter-gst/clutter-gst-camera-manager.c | |
| parent | a4b6dd885961948f5e4bd98e9c0f86de851f95da (diff) | |
| download | clutter-gst-61f1a5a00c500e212976a4f7f82076f21ebcdd7f.tar.gz | |
Drop Cogl-Gst dependency and reimport video sink
Diffstat (limited to 'clutter-gst/clutter-gst-camera-manager.c')
| -rw-r--r-- | clutter-gst/clutter-gst-camera-manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clutter-gst/clutter-gst-camera-manager.c b/clutter-gst/clutter-gst-camera-manager.c index 5b6d741..915942c 100644 --- a/clutter-gst/clutter-gst-camera-manager.c +++ b/clutter-gst/clutter-gst-camera-manager.c @@ -197,10 +197,6 @@ add_device (ClutterGstCameraManager *self, factory = gst_element_get_factory (videosrc); - if (!priv->camera_devices) - priv->camera_devices = - g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - device = g_object_new (CLUTTER_GST_TYPE_CAMERA_DEVICE, "element-factory", factory, "node", device_node, @@ -221,7 +217,7 @@ remove_device (ClutterGstCameraManager *self, const gchar *device_name) { ClutterGstCameraManagerPrivate *priv = self->priv; - gint i; + guint i; for (i = 0; i < priv->camera_devices->len; i++) { @@ -334,6 +330,9 @@ clutter_gst_camera_manager_init (ClutterGstCameraManager *self) { self->priv = GST_CAMERA_MANAGER_PRIVATE (self); + self->priv->camera_devices = + g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + probe_camera_devices (self); } |