Commit ccfd6a88 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

SD probe: always provide a long name

parent be41036f
...@@ -355,7 +355,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj ) ...@@ -355,7 +355,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
{ {
vlc_probe_t *probe = (vlc_probe_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, "video_dir{longname=\"My Videos\"}",
vlc_sd_probe_Add( probe, "audio_dir", N_("My Music") ); N_("My Videos") );
return vlc_sd_probe_Add( probe, "picture_dir", N_("My Pictures") ); 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;
} }
...@@ -282,8 +282,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj ) ...@@ -282,8 +282,11 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
{ {
vlc_probe_t *probe = (vlc_probe_t *)obj; vlc_probe_t *probe = (vlc_probe_t *)obj;
vlc_sd_probe_Add( probe, "shoutcast", N_("Shoutcast Radio") ); vlc_sd_probe_Add( probe, "shoutcast{longname=\"Shoutcast Radio\"}",
vlc_sd_probe_Add( probe, "shoutcasttv", N_("Shoutcast TV") ); N_("Shoutcast Radio") );
vlc_sd_probe_Add( probe, "frenchtv", N_("French TV") ); 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; return VLC_PROBE_CONTINUE;
} }
...@@ -73,8 +73,9 @@ static int vlc_sd_probe_Open (vlc_object_t *obj) ...@@ -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"); struct udev_monitor *mon = udev_monitor_new_from_netlink (udev, "udev");
if (mon != NULL) if (mon != NULL)
{ {
vlc_sd_probe_Add (probe, "v4l", N_("Capture devices")); vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}",
vlc_sd_probe_Add (probe, "disc", N_("Discs")); N_("Video capture"));
vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"));
udev_monitor_unref (mon); udev_monitor_unref (mon);
} }
udev_unref (udev); udev_unref (udev);
......
...@@ -79,7 +79,8 @@ static int vlc_sd_probe_Open (vlc_object_t *obj) ...@@ -79,7 +79,8 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
if (xcb_connection_has_error (conn)) if (xcb_connection_has_error (conn))
return VLC_PROBE_CONTINUE; return VLC_PROBE_CONTINUE;
xcb_disconnect (conn); 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"));
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment