summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sys/v4l/gstv4lelement.c6
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab76b1c0..8ede0022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-07-19 Tim-Philipp Müller <tim at centricular dot net>
+ Patch by: Martin Szulecki
+
+ * sys/v4l/gstv4lelement.c: (gst_v4lelement_get_property):
+ 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 <tim at centricular dot net>
+
* gst-libs/gst/tag/gstid3tag.c:
Add TSSE <=> GST_TAG_ENCODER mapping (see #347898).
diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c
index a2585588..dc73d55b 100644
--- a/sys/v4l/gstv4lelement.c
+++ b/sys/v4l/gstv4lelement.c
@@ -414,8 +414,12 @@ gst_v4lelement_get_property (GObject * object,
case PROP_DEVICE_NAME:{
gchar *new = NULL;
- if (GST_V4L_IS_OPEN (v4lelement))
+ if (GST_V4L_IS_OPEN (v4lelement)) {
+ new = v4lelement->vcap.name;
+ } else if (gst_v4l_open (v4lelement)) {
new = v4lelement->vcap.name;
+ gst_v4l_close (v4lelement);
+ }
g_value_set_string (value, new);
break;
}