SD probe: always provide a long name

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index d948f78891e6cd5184793aa8b7d5fff2095cd5e3..897d894dc7e29e2dd608a11a0b0285de7ffd3737 100644 (file)
--- a/modules/services_discovery/mediadirs.c
+++ b/modules/services_discovery/mediadirs.c
@@ -355,7 +355,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
 {
     vlc_probe_t *probe = (vlc_probe_t *)obj;
 
-    vlc_sd_probe_Add( probe, "video_dir", N_("My Videos") );
-    vlc_sd_probe_Add( probe, "audio_dir", N_("My Music") );
-    return vlc_sd_probe_Add( probe, "picture_dir", N_("My Pictures") );
+    vlc_sd_probe_Add( probe, "video_dir{longname=\"My Videos\"}",
+                      N_("My Videos") );
+    vlc_sd_probe_Add( probe, "audio_dir{longname=\"My Music\"}",
+                      N_("My Music") );
+    vlc_sd_probe_Add( probe, "picture_dir{longname=\"My Pictures\"}",
+                      N_("My Pictures") );
+    return VLC_PROBE_CONTINUE;
 }

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index b8f40f112a7304f4a5c38156b07096778240a92e..276e9b2d060676e6d6b5ddab9c533fca25dcb57b 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -282,8 +282,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
 {
     vlc_probe_t *probe = (vlc_probe_t *)obj;
 
-    vlc_sd_probe_Add( probe, "shoutcast", N_("Shoutcast Radio") );
-    vlc_sd_probe_Add( probe, "shoutcasttv", N_("Shoutcast TV") );
-    vlc_sd_probe_Add( probe, "frenchtv", N_("French TV") );
+    vlc_sd_probe_Add( probe, "shoutcast{longname=\"Shoutcast Radio\"}",
+                      N_("Shoutcast Radio") );
+    vlc_sd_probe_Add( probe, "shoutcasttv{longname=\"Shoutcast TV\"}",
+                      N_("Shoutcast TV") );
+    vlc_sd_probe_Add( probe, "frenchtv{longname=\"French TV\"}",
+                      N_("French TV") );
     return VLC_PROBE_CONTINUE;
 }

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 631b6793f16add208b6081311f20fc5077c02338..8ed89c3e9f99148b88b0b5e371b85c6afc704445 100644 (file)
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -73,8 +73,9 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
     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"));
+        vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}",
+                          N_("Video capture"));
+        vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"));
         udev_monitor_unref (mon);
     }
     udev_unref (udev);

diff --git a/modules/services_discovery/xcb_apps.c b/modules/services_discovery/xcb_apps.c
index ba9d4ad2cf16835f8935b4e67173871ee1b4e2e3..19ba85a8c95732c008ca21add84f77ddf8fe9641 100644 (file)
--- a/modules/services_discovery/xcb_apps.c
+++ b/modules/services_discovery/xcb_apps.c
@@ -79,7 +79,8 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
     if (xcb_connection_has_error (conn))
         return VLC_PROBE_CONTINUE;
     xcb_disconnect (conn);
-    return vlc_sd_probe_Add (probe, "xcb_apps", N_("Screen capture"));
+    return vlc_sd_probe_Add (probe, "xcb_apps{longname=\"Screen capture\"}",
+                             N_("Screen capture"));
 }
 
 /**