Shortname corrections

[vlc] / modules / services_discovery / udev.c

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 93e0857a93d6e617cc56fef4f37b5fbedd99c1f6..d24b9068cd49c2673cf40465a0d7d65254896755 100644 (file)
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -35,6 +35,7 @@
 static int OpenV4L (vlc_object_t *);
 static int OpenDisc (vlc_object_t *);
 static void Close (vlc_object_t *);
+static int vlc_sd_probe_Open (vlc_object_t *);
 
 /*
  * Module descriptor
@@ -57,12 +58,34 @@ vlc_module_begin ()
     set_callbacks (OpenDisc, Close)
     add_shortcut ("disc")
 
+    VLC_SD_PROBE_SUBMODULE
+
 vlc_module_end ()
 
+static int vlc_sd_probe_Open (vlc_object_t *obj)
+{
+    vlc_probe_t *probe = (vlc_probe_t *)obj;
+
+    struct udev *udev = udev_new ();
+    if (udev == NULL)
+        return VLC_EGENERIC;
+
+    struct udev_monitor *mon = udev_monitor_new_from_netlink (udev, "udev");
+    if (mon != NULL)
+    {
+        vlc_sd_probe_Add (probe, "v4l", N_("Capture devices"));
+        vlc_sd_probe_Add (probe, "disc", N_("Discs"));
+        udev_monitor_unref (mon);
+    }
+    udev_unref (udev);
+    return VLC_PROBE_CONTINUE;
+}
+
 struct device
 {
     dev_t devnum; /* must be first */
     input_item_t *item;
+    services_discovery_t *sd;
 };
 
 struct subsys
@@ -99,6 +122,8 @@ static void DestroyDevice (void *data)
 {
     struct device *d = data;
 
+    if (d->sd)
+        services_discovery_RemoveItem (d->sd, d->item);
     vlc_gc_decref (d->item);
     free (d);
 }
@@ -132,8 +157,9 @@ static int AddDevice (services_discovery_t *sd, struct udev_device *dev)
         vlc_gc_decref (item);
         return -1;
     }
-    d->item = item;
     d->devnum = udev_device_get_devnum (dev);
+    d->item = item;
+    d->sd = NULL;
 
     struct device **dp = tsearch (d, &p_sys->root, cmpdev);
     if (dp == NULL) /* Out-of-memory */
@@ -143,13 +169,13 @@ static int AddDevice (services_discovery_t *sd, struct udev_device *dev)
     }
     if (*dp != d) /* Overwrite existing device */
     {
-        services_discovery_RemoveItem (sd, (*dp)->item);
         DestroyDevice (*dp);
         *dp = d;
     }
 
     name = p_sys->subsys->get_cat (dev);
     services_discovery_AddItem (sd, item, name ? name : "Generic");
+    d->sd = sd;
     free (name);
     return 0;
 }
@@ -167,7 +193,6 @@ static void RemoveDevice (services_discovery_t *sd, struct udev_device *dev)
         return;
 
     struct device *d = *dp;
-    services_discovery_RemoveItem (sd, d->item);
     tdelete (d, &p_sys->root, cmpdev);
     DestroyDevice (d);
 }
@@ -280,6 +305,7 @@ static void *Run (void *data)
             if (errno != EINTR)
                 break;
 
+        int canc = vlc_savecancel ();
         struct udev_device *dev = udev_monitor_receive_device (mon);
         if (dev == NULL)
             continue;
@@ -295,6 +321,7 @@ static void *Run (void *data)
             AddDevice (sd, dev);
         }
         udev_device_unref (dev);
+        vlc_restorecancel (canc);
     }
     return NULL;
 }