[vlc-devel] commit: SD probe: always provide a long name ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb  6 17:15:18 2010 +0200| [ccfd6a88445732ec03d8e0977e3c3a27f80c86b3] | committer: Rémi Denis-Courmont 

SD probe: always provide a long name

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

 modules/services_discovery/mediadirs.c |   10 +++++++---
 modules/services_discovery/shout.c     |    9 ++++++---
 modules/services_discovery/udev.c      |    5 +++--
 modules/services_discovery/xcb_apps.c  |    3 ++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index d948f78..897d894 100644
--- 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 b8f40f1..276e9b2 100644
--- 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 631b679..8ed89c3 100644
--- 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 ba9d4ad..19ba85a 100644
--- 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"));
 }
 
 /**