# include <config.h>
#endif
+#include <errno.h>
+#include <search.h>
+#include <poll.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
#include <libudev.h>
+
#include <vlc_common.h>
#include <vlc_services_discovery.h>
#include <vlc_plugin.h>
-#include <vlc_url.h>
-#ifdef HAVE_SEARCH_H
-# include <search.h>
+#ifdef HAVE_ALSA
+# include <vlc_modules.h>
#endif
-#include <poll.h>
-#include <errno.h>
+#include <vlc_url.h>
static int OpenV4L (vlc_object_t *);
#ifdef HAVE_ALSA
vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}",
N_("Video capture"), SD_CAT_DEVICES);
#ifdef HAVE_ALSA
- vlc_sd_probe_Add (probe, "alsa{longname=\"Audio capture\"}",
- N_("Audio capture"), SD_CAT_DEVICES);
+ if (!module_exists ("pulselist"))
+ vlc_sd_probe_Add (probe, "alsa{longname=\"Audio capture\"}",
+ N_("Audio capture"), SD_CAT_DEVICES);
#endif
vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"),
SD_CAT_DEVICES);
const char *name;
char * (*get_mrl) (struct udev_device *dev);
char * (*get_name) (struct udev_device *dev);
- char * (*get_cat) (struct udev_device *dev);
int item_type;
};
dev_t delta = *da - *db;
if (sizeof (delta) > sizeof (int))
- return delta ? ((delta > 0) ? 1 : -1) : 0;
+ return delta ? (((signed)delta > 0) ? 1 : -1) : 0;
return (signed)delta;
}
*dp = d;
}
- name = p_sys->subsys->get_cat (dev);
- services_discovery_AddItem (sd, item, name ? name : "Generic");
+ services_discovery_AddItem (sd, item, NULL);
d->sd = sd;
- free (name);
return 0;
}
return prd ? strdup (prd) : NULL;
}
-static char *v4l_get_cat (struct udev_device *dev)
-{
- return decode_property (dev, "ID_VENDOR_ENC");
-}
-
int OpenV4L (vlc_object_t *obj)
{
static const struct subsys subsys = {
- "video4linux", v4l_get_mrl, v4l_get_name, v4l_get_cat, ITEM_TYPE_CARD,
+ "video4linux", v4l_get_mrl, v4l_get_name, ITEM_TYPE_CARD,
};
return Open (obj, &subsys);
return name;
}
-static char *alsa_get_cat (struct udev_device *dev)
-{
- const char *vnd;
-
- dev = udev_device_get_parent (dev);
- if (dev == NULL)
- return NULL;
-
- vnd = udev_device_get_property_value (dev, "ID_VENDOR_FROM_DATABASE");
- if (vnd == NULL)
- /* FIXME: USB may take time to settle... the parent device */
- vnd = udev_device_get_property_value (dev, "ID_BUS");
- return vnd ? strdup (vnd) : NULL;
-}
-
int OpenALSA (vlc_object_t *obj)
{
static const struct subsys subsys = {
- "sound", alsa_get_mrl, alsa_get_name, alsa_get_cat, ITEM_TYPE_CARD,
+ "sound", alsa_get_mrl, alsa_get_name, ITEM_TYPE_CARD,
};
return Open (obj, &subsys);
/*** Discs support ***/
static char *disc_get_mrl (struct udev_device *dev)
{
+ const char *node = udev_device_get_devnode (dev);
const char *val;
val = udev_device_get_property_value (dev, "ID_CDROM");
return NULL; /* Ignore non-optical block devices */
val = udev_device_get_property_value (dev, "ID_CDROM_MEDIA_STATE");
- if (val && !strcmp (val, "blank"))
+ if (val == NULL)
+ { /* Force probing of the disc in the drive if any. */
+ int fd = open (node, O_RDONLY|O_CLOEXEC);
+ if (fd != -1)
+ close (fd);
+ return NULL;
+ }
+ if (!strcmp (val, "blank"))
return NULL; /* ignore empty drives and virgin recordable discs */
const char *scheme = NULL;
val = udev_device_get_property_value (dev, "ID_CDROM_MEDIA_BD");
if (val && atoi (val))
- scheme = "bd";
+ scheme = "bluray";
#ifdef LOL
val = udev_device_get_property_value (dev, "ID_CDROM_MEDIA_HDDVD");
if (val && atoi (val))
if (scheme == NULL)
return NULL;
- val = udev_device_get_devnode (dev);
- return make_URI (val, scheme);
+ return vlc_path2uri (node, scheme);
}
static char *disc_get_name (struct udev_device *dev)
{
- return decode_property (dev, "ID_FS_LABEL_ENC");
-}
-
-static char *disc_get_cat (struct udev_device *dev)
-{
+ char *name = NULL;
struct udev_list_entry *list, *entry;
list = udev_device_get_properties_list_entry (dev);
else if (!strncmp (name, "DVD", 3))
cat = N_("DVD");
else if (!strncmp (name, "BD", 2))
- cat = N_("Blu-Ray");
+ cat = N_("Blu-ray");
else if (!strncmp (name, "HDDVD", 5))
cat = N_("HD DVD");
if (cat == NULL)
cat = N_("Unknown type");
- return strdup (vlc_gettext (cat));
+
+ char *label = decode_property (dev, "ID_FS_LABEL_ENC");
+
+ if (label)
+ if (asprintf(&name, "%s (%s)", label, vlc_gettext(cat)) < 0)
+ name = NULL;
+ free(label);
+
+ return name;
}
int OpenDisc (vlc_object_t *obj)
{
static const struct subsys subsys = {
- "block", disc_get_mrl, disc_get_name, disc_get_cat, ITEM_TYPE_DISC,
+ "block", disc_get_mrl, disc_get_name, ITEM_TYPE_DISC,
};
return Open (obj, &subsys);