[vlc-devel] commit: udev: handle "change" action properly, fix disc ejection/insertion ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 17 17:57:08 2009 +0300| [54881bb77ea3af56647a8a1d78b46101dae39c13] | committer: Rémi Denis-Courmont 

udev: handle "change" action properly, fix disc ejection/insertion
(cherry picked from commit 64f7e7651f896b3ba6001486400d798af19a6f17)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=54881bb77ea3af56647a8a1d78b46101dae39c13
---

 modules/services_discovery/udev.c |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index b443a83..93e0857 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -172,15 +172,6 @@ static void RemoveDevice (services_discovery_t *sd, struct udev_device *dev)
     DestroyDevice (d);
 }
 
-static void HandleDevice (services_discovery_t *sd, struct udev_device *dev,
-                          bool add)
-{
-    if (!add)
-        RemoveDevice (sd, dev);
-    else
-        AddDevice (sd, dev);
-}
-
 static void *Run (void *);
 
 /**
@@ -230,7 +221,7 @@ static int Open (vlc_object_t *obj, const struct subsys *subsys)
     {
         const char *path = udev_list_entry_get_name (deventry);
         struct udev_device *dev = udev_device_new_from_syspath (udev, path);
-        HandleDevice (sd, dev, true);
+        AddDevice (sd, dev);
         udev_device_unref (dev);
     }
     udev_enumerate_unref (devenum);
@@ -293,13 +284,16 @@ static void *Run (void *data)
         if (dev == NULL)
             continue;
 
-        /* FIXME: handle change, offline, online */
         const char *action = udev_device_get_action (dev);
         if (!strcmp (action, "add"))
-            HandleDevice (sd, dev, true);
+            AddDevice (sd, dev);
         else if (!strcmp (action, "remove"))
-            HandleDevice (sd, dev, false);
-
+            RemoveDevice (sd, dev);
+        else if (!strcmp (action, "change"))
+        {
+            RemoveDevice (sd, dev);
+            AddDevice (sd, dev);
+        }
         udev_device_unref (dev);
     }
     return NULL;