mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-23 09:04:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/v4l2/gstv4l2object.c: Reprobe devices again instead of taking a cached list as new devices could've been plugged ...

Browse source 
Original commit message from CVS:
Patch by: Mike Ruprecht <cmaiku at gmail dot com>
* sys/v4l2/gstv4l2object.c: (gst_v4l2_class_probe_devices):
Reprobe devices again instead of taking a cached list as new
devices could've been plugged in. Fixes bug #549062.
This commit is contained in:
Mike Ruprecht 2008-08-23 15:33:49 +00:00 committed by Sebastian Dröge
parent 1e10b33f15
commit e14c307e2d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-08-23 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Mike Ruprecht <cmaiku at gmail dot com>
* sys/v4l2/gstv4l2object.c: (gst_v4l2_class_probe_devices):
Reprobe devices again instead of taking a cached list as new
devices could've been plugged in. Fixes bug #549062.
2008-08-22 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-08-22 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/autodetect/Makefile.am: * gst/autodetect/Makefile.am:

8
sys/v4l2/gstv4l2object.c
View file

@ -75,7 +75,7 @@ gst_v4l2_class_probe_devices (GstElementClass * klass, gboolean check,
static gboolean init = FALSE; static gboolean init = FALSE;
static GList *devices = NULL; static GList *devices = NULL;
if (!init && !check) { if (!check) {
const gchar *dev_base[] = { "/dev/video", "/dev/v4l2/video", NULL }; const gchar *dev_base[] = { "/dev/video", "/dev/v4l2/video", NULL };
gint base, n, fd; gint base, n, fd;
@ -83,7 +83,7 @@ gst_v4l2_class_probe_devices (GstElementClass * klass, gboolean check,
GList *item = devices; GList *item = devices;
gchar *device = item->data; gchar *device = item->data;
devices = g_list_remove (devices, item); devices = g_list_remove (devices, device);
g_free (device); g_free (device);
} }
@ -439,8 +439,8 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object)
gst_tuner_set_channel (tuner, channel); gst_tuner_set_channel (tuner, channel);
} else { } else {
channel = channel =
GST_TUNER_CHANNEL (gst_tuner_get_channel (GST_TUNER (v4l2object-> GST_TUNER_CHANNEL (gst_tuner_get_channel (GST_TUNER
element))); (v4l2object->element)));
if (channel) { if (channel) {
g_free (v4l2object->channel); g_free (v4l2object->channel);
v4l2object->channel = g_strdup (channel->label); v4l2object->channel = g_strdup (channel->label);