#include <vlc_common.h>
#include <vlc_services_discovery.h>
#include <vlc_plugin.h>
+#include <search.h>
#include <poll.h>
#include <errno.h>
static int OpenV4L (vlc_object_t *);
+static int OpenALSA (vlc_object_t *);
static int OpenDisc (vlc_object_t *);
static void Close (vlc_object_t *);
+static int vlc_sd_probe_Open (vlc_object_t *);
/*
* Module descriptor
*/
vlc_module_begin ()
- set_shortname (N_("Devices"))
- set_description (N_("Capture devices"))
+ set_shortname (N_("Video capture"))
+ set_description (N_("Video capture (Video4Linux)"))
set_category (CAT_PLAYLIST)
set_subcategory (SUBCAT_PLAYLIST_SD)
set_capability ("services_discovery", 0)
set_callbacks (OpenV4L, Close)
add_shortcut ("v4l")
+ add_submodule ()
+ set_shortname (N_("Audio capture"))
+ set_description (N_("Audio capture (ALSA)"))
+ set_category (CAT_PLAYLIST)
+ set_subcategory (SUBCAT_PLAYLIST_SD)
+ set_capability ("services_discovery", 0)
+ set_callbacks (OpenALSA, Close)
+ add_shortcut ("alsa")
+
add_submodule ()
set_shortname (N_("Discs"))
set_description (N_("Discs"))
set_callbacks (OpenDisc, Close)
add_shortcut ("disc")
+ VLC_SD_PROBE_SUBMODULE
+
vlc_module_end ()
+static int vlc_sd_probe_Open (vlc_object_t *obj)
+{
+ vlc_probe_t *probe = (vlc_probe_t *)obj;
+
+ struct udev *udev = udev_new ();
+ if (udev == NULL)
+ return VLC_PROBE_CONTINUE;
+
+ struct udev_monitor *mon = udev_monitor_new_from_netlink (udev, "udev");
+ if (mon != NULL)
+ {
+ vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}",
+ N_("Video capture"), SD_CAT_DEVICES);
+ vlc_sd_probe_Add (probe, "alsa{longname=\"Audio capture\"}",
+ N_("Audio capture"), SD_CAT_DEVICES);
+ vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"),
+ SD_CAT_MYCOMPUTER);
+ udev_monitor_unref (mon);
+ }
+ udev_unref (udev);
+ return VLC_PROBE_CONTINUE;
+}
+
+struct device
+{
+ dev_t devnum; /* must be first */
+ input_item_t *item;
+ services_discovery_t *sd;
+};
+
struct subsys
{
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;
};
struct services_discovery_sys_t
const struct subsys *subsys;
struct udev_monitor *monitor;
vlc_thread_t thread;
- input_item_t **itemv;
- size_t itemc;
+ void *root;
};
+/**
+ * Compares two devices (to support binary search).
+ */
+static int cmpdev (const void *a, const void *b)
+{
+ const dev_t *da = a, *db = b;
+ dev_t delta = *da - *db;
+
+ if (sizeof (delta) > sizeof (int))
+ return delta ? ((delta > 0) ? 1 : -1) : 0;
+ return (signed)delta;
+}
+
+static void DestroyDevice (void *data)
+{
+ struct device *d = data;
+
+ if (d->sd)
+ services_discovery_RemoveItem (d->sd, d->item);
+ vlc_gc_decref (d->item);
+ free (d);
+}
+
+static char *decode_property (struct udev_device *, const char *);
+
+/**
+ * Adds a udev device.
+ */
+static int AddDevice (services_discovery_t *sd, struct udev_device *dev)
+{
+ services_discovery_sys_t *p_sys = sd->p_sys;
+
+ char *mrl = p_sys->subsys->get_mrl (dev);
+ if (mrl == NULL)
+ return 0; /* don't know if it was an error... */
+ char *name = p_sys->subsys->get_name (dev);
+ input_item_t *item = input_item_NewWithType (VLC_OBJECT (sd), mrl,
+ name ? name : mrl,
+ 0, NULL, 0, -1,
+ p_sys->subsys->item_type);
+ msg_Dbg (sd, "adding %s (%s)", mrl, name);
+ free (name);
+ free (mrl);
+ if (item == NULL)
+ return -1;
+
+ struct device *d = malloc (sizeof (*d));
+ if (d == NULL)
+ {
+ vlc_gc_decref (item);
+ return -1;
+ }
+ d->devnum = udev_device_get_devnum (dev);
+ d->item = item;
+ d->sd = NULL;
+
+ struct device **dp = tsearch (d, &p_sys->root, cmpdev);
+ if (dp == NULL) /* Out-of-memory */
+ {
+ DestroyDevice (d);
+ return -1;
+ }
+ if (*dp != d) /* Overwrite existing device */
+ {
+ DestroyDevice (*dp);
+ *dp = d;
+ }
+
+ name = p_sys->subsys->get_cat (dev);
+ services_discovery_AddItem (sd, item, name ? name : "Generic");
+ d->sd = sd;
+ free (name);
+ return 0;
+}
+
+/**
+ * Removes a udev device (if present).
+ */
+static void RemoveDevice (services_discovery_t *sd, struct udev_device *dev)
+{
+ services_discovery_sys_t *p_sys = sd->p_sys;
+
+ dev_t num = udev_device_get_devnum (dev);
+ struct device **dp = tfind (&(dev_t){ num }, &p_sys->root, cmpdev);
+ if (dp == NULL)
+ return;
+
+ struct device *d = *dp;
+ tdelete (d, &p_sys->root, cmpdev);
+ DestroyDevice (d);
+}
+
static void *Run (void *);
-static void HandleDevice (services_discovery_t *, struct udev_device *, bool);
/**
* Probes and initializes.
return VLC_ENOMEM;
sd->p_sys = p_sys;
p_sys->subsys = subsys;
- p_sys->itemv = NULL;
- p_sys->itemc = 0;
+ p_sys->root = NULL;
struct udev_monitor *mon = NULL;
struct udev *udev = udev_new ();
{
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);
return VLC_EGENERIC;
}
-
/**
* Releases resources
*/
udev_unref (udev);
}
- for (size_t i = 0; i < p_sys->itemc; i++)
- vlc_gc_decref (p_sys->itemv[i]);
- free (p_sys->itemv);
+ tdestroy (p_sys->root, DestroyDevice);
free (p_sys);
}
-
static void *Run (void *data)
{
services_discovery_t *sd = data;
if (errno != EINTR)
break;
+ int canc = vlc_savecancel ();
struct udev_device *dev = udev_monitor_receive_device (mon);
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);
+ vlc_restorecancel (canc);
}
return NULL;
}
+/**
+ * Converts an hexadecimal digit to an integer.
+ */
static int hex (char c)
{
if (c >= '0' && c <= '9')
return -1;
}
+/**
+ * Decodes a udev hexadecimal-encoded property.
+ */
static char *decode (const char *enc)
{
char *ret = enc ? strdup (enc) : NULL;
return decode (udev_device_get_property_value (dev, name));
}
-static void HandleDevice (services_discovery_t *sd, struct udev_device *dev,
- bool add)
-{
- services_discovery_sys_t *p_sys = sd->p_sys;
-
- /* Determine media location */
- char *mrl = p_sys->subsys->get_mrl (dev);
- if (mrl == NULL)
- return;
-
- /* Find item in list */
- input_item_t *item = NULL;
- size_t i;
-
- for (i = 0; i < p_sys->itemc; i++)
- {
- input_item_t *oitem = p_sys->itemv[i];
- char *omrl = input_item_GetURI (oitem);
-
- if (!strcmp (omrl, mrl))
- {
- item = oitem;
- break;
- }
- }
-
- /* Add/Remove old item */
- if (add && (item == NULL))
- {
- char *name = p_sys->subsys->get_name (dev);
- item = input_item_NewWithType (VLC_OBJECT (sd), mrl,
- name ? name : "Unnamed",
- 0, NULL, 0, -1, ITEM_TYPE_CARD);
- free (name);
- if (item != NULL)
- {
- msg_Dbg (sd, "adding %s", mrl);
- name = p_sys->subsys->get_cat (dev);
- services_discovery_AddItem (sd, item, name ? name : "Generic");
- free (name);
-
- TAB_APPEND (p_sys->itemc, p_sys->itemv, item);
- }
- }
- else if (!add && (item != NULL))
- {
- msg_Dbg (sd, "removing %s", mrl);
- services_discovery_RemoveItem (sd, item);
- vlc_gc_decref (item);
- TAB_REMOVE (p_sys->itemc, p_sys->itemv, i);
- }
- free (mrl);
-}
/*** Video4Linux support ***/
static bool is_v4l_legacy (struct udev_device *dev)
int OpenV4L (vlc_object_t *obj)
{
static const struct subsys subsys = {
- "video4linux", v4l_get_mrl, v4l_get_name, v4l_get_cat,
+ "video4linux", v4l_get_mrl, v4l_get_name, v4l_get_cat, ITEM_TYPE_CARD,
};
return Open (obj, &subsys);
}
+
+/*** Advanced Linux Sound Architecture support ***/
+static int alsa_get_device (struct udev_device *dev, unsigned *restrict pcard,
+ unsigned *restrict pdevice)
+{
+ const char *node = udev_device_get_devnode (dev);
+ char type;
+
+ if (node == NULL)
+ return -1;
+ if (sscanf (node, "/dev/snd/pcmC%uD%u%c", pcard, pdevice, &type) < 3)
+ return -1;
+ if (type != 'c')
+ return -1;
+ return 0;
+}
+
+
+static char *alsa_get_mrl (struct udev_device *dev)
+{
+ /* Determine media location */
+ char *mrl;
+ unsigned card, device;
+
+ if (alsa_get_device (dev, &card, &device))
+ return NULL;
+
+ if (asprintf (&mrl, "alsa://plughw:%u,%u", card, device) == -1)
+ mrl = NULL;
+ return mrl;
+}
+
+static char *alsa_get_name (struct udev_device *dev)
+{
+ char *name;
+ unsigned card, device;
+
+ if (alsa_get_device (dev, &card, &device))
+ return NULL;
+
+ if (asprintf (&name, _("Device %u"), device) == -1)
+ name = NULL;
+ return name;
+}
+
+static char *alsa_get_cat (struct udev_device *dev)
+{
+ char *name;
+ unsigned card, device;
+
+ if (alsa_get_device (dev, &card, &device))
+ return NULL;
+
+ if (asprintf (&name, _("Card %u"), card) == -1)
+ name = NULL;
+ return name;
+}
+
+int OpenALSA (vlc_object_t *obj)
+{
+ static const struct subsys subsys = {
+ "sound", alsa_get_mrl, alsa_get_name, alsa_get_cat, ITEM_TYPE_CARD,
+ };
+
+ return Open (obj, &subsys);
+}
+
+
/*** Discs support ***/
static char *disc_get_mrl (struct udev_device *dev)
{
int OpenDisc (vlc_object_t *obj)
{
static const struct subsys subsys = {
- "block", disc_get_mrl, disc_get_name, disc_get_cat,
+ "block", disc_get_mrl, disc_get_name, disc_get_cat, ITEM_TYPE_DISC,
};
return Open (obj, &subsys);