From c8e459496b315ada563c65c0703e574b5913e849 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Wed, 19 Jul 2006 14:36:00 +0000 Subject: sys/v4l2/gstv4l2object.c: If "device-name" is requested and the device is not open, try to temporarily open it to obt... Original commit message from CVS: Patch by: Martin Szulecki * sys/v4l2/gstv4l2object.c: (gst_v4l2_object_get_property_helper): If "device-name" is requested and the device is not open, try to temporarily open it to obtain this information (#342494). --- ChangeLog | 9 +++++++++ sys/v4l2/gstv4l2object.c | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7f086cee..b91cd22f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-07-19 Tim-Philipp Müller + + Patch by: Martin Szulecki + + * sys/v4l2/gstv4l2object.c: (gst_v4l2_object_get_property_helper): + If "device-name" is requested and the device is not + open, try to temporarily open it to obtain this + information (#342494). + 2006-07-19 Tim-Philipp Müller * gst/nsf/nsf.c: (nsf_load): diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 24120dd0..148ca399 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -406,8 +406,12 @@ gst_v4l2_object_get_property_helper (GstV4l2Object * v4l2object, { gchar *new = NULL; - if (GST_V4L2_IS_OPEN (v4l2object)) + if (GST_V4L2_IS_OPEN (v4l2object)) { + new = (gchar *) v4l2object->vcap.card; + } else if (gst_v4l2_open (v4l2object)) { new = (gchar *) v4l2object->vcap.card; + gst_v4l2_close (v4l2object); + } g_value_set_string (value, new); break; } -- cgit v1.2.1