mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
pipewire/src/examples/media-session/alsa-monitor.c

557 lines
14 KiB
C
Raw Normal View History

session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
/* PipeWire
*
* Copyright © 2019 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <math.h>
#include <time.h>
#include "config.h"
#include <spa/node/node.h>
#include <spa/utils/hook.h>
#include <spa/utils/names.h>
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
#include <spa/utils/keys.h>
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
#include <spa/param/audio/format-utils.h>
#include <spa/param/props.h>
#include <spa/debug/dict.h>
#include "pipewire/pipewire.h"
#include "pipewire/private.h"
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
#include "reserve.c"
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
struct alsa_object;
struct alsa_node {
struct monitor *monitor;
struct alsa_object *object;
struct spa_list link;
uint32_t id;
struct pw_properties *props;
struct pw_proxy *proxy;
struct spa_node *node;
};
struct alsa_object {
struct monitor *monitor;
struct spa_list link;
uint32_t id;
core: remove parent_id from the global event Remove the parent_id from the global event. Remove the parent and owner from the global object. Use properties instead to mark parents and owners of objects. Properties are easier to control for client exported objects and usually a simple parent/child is not enough. For example, a client exported node has the client as a parent but also the factory that created the node.
2019-08-16 22:11:42 +02:00
uint32_t device_id;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
struct rd_device *reserve;
struct spa_hook sync_listener;
int seq;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
struct pw_properties *props;
struct spa_handle *handle;
struct pw_proxy *proxy;
struct spa_device *device;
struct spa_hook device_listener;
struct spa_list node_list;
};
static struct alsa_node *alsa_find_node(struct alsa_object *obj, uint32_t id)
{
struct alsa_node *node;
spa_list_for_each(node, &obj->node_list, link) {
if (node->id == id)
return node;
}
return NULL;
}
static void alsa_update_node(struct alsa_object *obj, struct alsa_node *node,
const struct spa_device_object_info *info)
{
pw_log_debug("update node %u", node->id);
pw_properties_update(node->props, info->props);
spa_debug_dict(0, info->props);
}
static struct alsa_node *alsa_create_node(struct alsa_object *obj, uint32_t id,
const struct spa_device_object_info *info)
{
struct alsa_node *node;
struct monitor *monitor = obj->monitor;
struct impl *impl = monitor->impl;
int res;
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
const char *dev, *subdev;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
pw_log_debug("new node %u", id);
if (info->type != SPA_TYPE_INTERFACE_Node) {
errno = EINVAL;
return NULL;
}
node = calloc(1, sizeof(*node));
if (node == NULL) {
res = -errno;
goto exit;
}
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
node->props = pw_properties_new_dict(info->props);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
core: remove parent_id from the global event Remove the parent_id from the global event. Remove the parent and owner from the global object. Use properties instead to mark parents and owners of objects. Properties are easier to control for client exported objects and usually a simple parent/child is not enough. For example, a client exported node has the client as a parent but also the factory that created the node.
2019-08-16 22:11:42 +02:00
if (obj->device_id != 0)
pw_properties_setf(node->props, PW_KEY_DEVICE_ID, "%d", obj->device_id);
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
pw_properties_set(node->props, "factory.name", info->factory_name);
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
if ((dev = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_DEVICE)) == NULL)
dev = "0";
if ((subdev = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_SUBDEVICE)) == NULL)
subdev = "0";
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
if (pw_properties_get(node->props, SPA_KEY_NODE_NAME) == NULL) {
const char *devname, *stream;
if ((devname = pw_properties_get(obj->props, SPA_KEY_DEVICE_NAME)) == NULL)
devname = "unknown";
if ((stream = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_STREAM)) == NULL)
stream = "unknown";
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
improve properties on node and port Rename some alsa filenames.
2019-09-23 20:51:34 +02:00
pw_properties_setf(node->props, SPA_KEY_NODE_NAME, "%s.%s.%s.%s",
devname, stream, dev, subdev);
}
if (pw_properties_get(node->props, PW_KEY_NODE_DESCRIPTION) == NULL) {
const char *desc, *name = NULL;
if ((desc = pw_properties_get(obj->props, SPA_KEY_DEVICE_DESCRIPTION)) == NULL)
desc = "unknown";
name = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_NAME);
if (name == NULL)
name = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_ID);
if (name == NULL)
name = dev;
if (strcmp(subdev, "0")) {
pw_properties_setf(node->props, PW_KEY_NODE_DESCRIPTION, "%s (%s %s)",
desc, name, subdev);
} else if (strcmp(dev, "0")) {
pw_properties_setf(node->props, PW_KEY_NODE_DESCRIPTION, "%s (%s)",
desc, name);
} else {
pw_properties_setf(node->props, PW_KEY_NODE_DESCRIPTION, "%s",
desc);
}
}
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
node->monitor = monitor;
node->object = obj;
node->id = id;
node->proxy = pw_core_proxy_create_object(impl->core_proxy,
"adapter",
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
&node->props->dict,
0);
if (node->proxy == NULL) {
res = -errno;
goto clean_node;
}
spa_list_append(&obj->node_list, &node->link);
return node;
clean_node:
pw_properties_free(node->props);
free(node);
exit:
errno = -res;
return NULL;
}
static void alsa_remove_node(struct alsa_object *obj, struct alsa_node *node)
{
pw_log_debug("remove node %u", node->id);
spa_list_remove(&node->link);
pw_proxy_destroy(node->proxy);
free(node);
}
static void alsa_device_info(void *data, const struct spa_device_info *info)
{
struct alsa_object *obj = data;
core: remove parent_id from the global event Remove the parent_id from the global event. Remove the parent and owner from the global object. Use properties instead to mark parents and owners of objects. Properties are easier to control for client exported objects and usually a simple parent/child is not enough. For example, a client exported node has the client as a parent but also the factory that created the node.
2019-08-16 22:11:42 +02:00
const char *str;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
pw_properties_update(obj->props, info->props);
core: remove parent_id from the global event Remove the parent_id from the global event. Remove the parent and owner from the global object. Use properties instead to mark parents and owners of objects. Properties are easier to control for client exported objects and usually a simple parent/child is not enough. For example, a client exported node has the client as a parent but also the factory that created the node.
2019-08-16 22:11:42 +02:00
if ((str = pw_properties_get(obj->props, PW_KEY_DEVICE_ID)) != NULL)
obj->device_id = pw_properties_parse_int(str);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
spa_debug_dict(0, info->props);
}
static void alsa_device_object_info(void *data, uint32_t id,
const struct spa_device_object_info *info)
{
struct alsa_object *obj = data;
struct alsa_node *node;
node = alsa_find_node(obj, id);
if (info == NULL) {
if (node == NULL) {
pw_log_warn("object %p: unknown node %u", obj, id);
return;
}
alsa_remove_node(obj, node);
} else if (node == NULL) {
alsa_create_node(obj, id, info);
} else {
alsa_update_node(obj, node, info);
}
}
static const struct spa_device_events alsa_device_events = {
SPA_VERSION_DEVICE_EVENTS,
.info = alsa_device_info,
.object_info = alsa_device_object_info
};
static struct alsa_object *alsa_find_object(struct monitor *monitor, uint32_t id)
{
struct alsa_object *obj;
spa_list_for_each(obj, &monitor->object_list, link) {
if (obj->id == id)
return obj;
}
return NULL;
}
static void alsa_update_object(struct monitor *monitor, struct alsa_object *obj,
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
const struct spa_device_object_info *info)
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
{
pw_log_debug("update object %u", obj->id);
spa_debug_dict(0, info->props);
pw_properties_update(obj->props, info->props);
}
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
static int update_device_props(struct alsa_object *obj)
{
struct pw_properties *p = obj->props;
const char *s, *d;
char temp[32];
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) {
keys: rename device.id to device.bus-id
2019-08-16 21:52:32 +02:00
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_ID)) == NULL) {
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) {
snprintf(temp, sizeof(temp), "%d", obj->id);
s = temp;
}
}
}
pw_properties_setf(p, PW_KEY_DEVICE_NAME, "alsa_card.%s", s);
if (pw_properties_get(p, PW_KEY_DEVICE_DESCRIPTION) == NULL) {
d = NULL;
if ((s = pw_properties_get(p, PW_KEY_DEVICE_FORM_FACTOR)))
if (strcmp(s, "internal") == 0)
d = "Built-in Audio";
if (!d)
if ((s = pw_properties_get(p, PW_KEY_DEVICE_CLASS)))
if (strcmp(s, "modem") == 0)
d = "Modem";
if (!d)
d = pw_properties_get(p, PW_KEY_DEVICE_PRODUCT_NAME);
if (!d)
d = "Unknown device";
pw_properties_set(p, PW_KEY_DEVICE_DESCRIPTION, d);
}
if (pw_properties_get(p, PW_KEY_DEVICE_ICON_NAME) == NULL) {
d = NULL;
if ((s = pw_properties_get(p, PW_KEY_DEVICE_FORM_FACTOR))) {
if (strcmp(s, "microphone") == 0)
d = "audio-input-microphone";
else if (strcmp(s, "webcam") == 0)
d = "camera-web";
else if (strcmp(s, "computer") == 0)
d = "computer";
else if (strcmp(s, "handset") == 0)
d = "phone";
else if (strcmp(s, "portable") == 0)
d = "multimedia-player";
else if (strcmp(s, "tv") == 0)
d = "video-display";
else if (strcmp(s, "headset") == 0)
d = "audio-headset";
else if (strcmp(s, "headphone") == 0)
d = "audio-headphones";
else if (strcmp(s, "speaker") == 0)
d = "audio-speakers";
else if (strcmp(s, "hands-free") == 0)
d = "audio-handsfree";
}
if (!d)
if ((s = pw_properties_get(p, PW_KEY_DEVICE_CLASS)))
if (strcmp(s, "modem") == 0)
d = "modem";
if (!d)
d = "audio-card";
s = pw_properties_get(p, PW_KEY_DEVICE_BUS);
pw_properties_setf(p, PW_KEY_DEVICE_ICON_NAME,
"%s-analog%s%s", d, s ? "-" : "", s);
}
return 1;
}
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
static void set_profile(struct alsa_object *obj, int index)
{
char buf[1024];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
spa_device_set_param(obj->device,
SPA_PARAM_Profile, 0,
spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamProfile, 0,
SPA_PARAM_PROFILE_index, SPA_POD_Int(index)));
}
static void reserve_acquired(void *data, struct rd_device *d)
{
struct alsa_object *obj = data;
pw_log_debug("%p: reserve acquired", obj);
set_profile(obj, 1);
}
static void sync_complete_done(void *data, int seq)
{
struct alsa_object *obj = data;
if (seq != obj->seq)
return;
spa_hook_remove(&obj->sync_listener);
obj->seq = 0;
rd_device_complete_release(obj->reserve, true);
}
static const struct pw_proxy_events sync_complete_release = {
PW_VERSION_PROXY_EVENTS,
.done = sync_complete_done
};
static void reserve_release(void *data, struct rd_device *d, int forced)
{
struct alsa_object *obj = data;
pw_log_debug("%p: reserve release", obj);
set_profile(obj, 0);
if (obj->seq == 0)
pw_proxy_add_listener(obj->proxy,
&obj->sync_listener,
&sync_complete_release, obj);
obj->seq = pw_proxy_sync(obj->proxy, 0);
}
static const struct rd_device_callbacks reserve_callbacks = {
.acquired = reserve_acquired,
.release = reserve_release,
};
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
static struct alsa_object *alsa_create_object(struct monitor *monitor, uint32_t id,
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
const struct spa_device_object_info *info)
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
{
struct impl *impl = monitor->impl;
struct pw_core *core = impl->core;
struct alsa_object *obj;
struct spa_handle *handle;
int res;
void *iface;
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
const char *card;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
pw_log_debug("new object %u", id);
if (info->type != SPA_TYPE_INTERFACE_Device) {
errno = EINVAL;
return NULL;
}
handle = pw_core_load_spa_handle(core,
info->factory_name,
info->props);
if (handle == NULL) {
res = -errno;
pw_log_error("can't make factory instance: %m");
goto exit;
}
if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
pw_log_error("can't get %d interface: %d", info->type, res);
goto unload_handle;
}
obj = calloc(1, sizeof(*obj));
if (obj == NULL) {
res = -errno;
goto unload_handle;
}
obj->monitor = monitor;
obj->id = id;
obj->handle = handle;
obj->device = iface;
obj->props = pw_properties_new_dict(info->props);
channelmix: implement per channel volume Implement per channel volume on channelmix. Extend control on stream to take an array of values when possible. Remove name argument from pw_node_new and pw_device_new. We can pass this as a property instead. Improve properties on nodes to more closely match what pulseaudio does. Don't let the monitor do too much with the udev properties but let the session manager set the description and icon-names. Remove some change_mask flags for things that don't change in introspect. Use the flags to mark changes in -cli and -monitor.
2019-08-12 14:47:16 +02:00
update_device_props(obj);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
obj->proxy = pw_remote_export(impl->remote,
examples: copy properties for pw_remote_export() pw_remote_export() takes ownership of the properties so make a copy of the ones we still want to hold on to.
2019-09-27 10:13:21 +02:00
info->type, pw_properties_copy(obj->props), obj->device, 0);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
if (obj->proxy == NULL) {
res = -errno;
goto clean_object;
}
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
if ((card = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_CARD)) != NULL) {
const char *reserve;
pw_properties_setf(obj->props, "api.dbus.ReserveDevice1", "Audio%s", card);
reserve = pw_properties_get(obj->props, "api.dbus.ReserveDevice1");
obj->reserve = rd_device_new(impl->conn, reserve,
"PipeWire", 0,
&reserve_callbacks, obj);
if (obj->reserve == NULL) {
pw_log_warn("can't create device reserve for %s: %m", reserve);
} else {
rd_device_set_application_device_name(obj->reserve,
spa_dict_lookup(info->props, SPA_KEY_API_ALSA_PATH));
spa: improve object properties
2019-10-01 10:04:22 +02:00
}
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
}
spa: improve object properties
2019-10-01 10:04:22 +02:00
/* no device reservation, activate device right now */
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
if (obj->reserve == NULL)
set_profile(obj, 1);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
spa_list_init(&obj->node_list);
spa_device_add_listener(obj->device,
&obj->device_listener, &alsa_device_events, obj);
spa_list_append(&monitor->object_list, &obj->link);
return obj;
clean_object:
free(obj);
unload_handle:
pw_unload_spa_handle(handle);
exit:
errno = -res;
return NULL;
}
static void alsa_remove_object(struct monitor *monitor, struct alsa_object *obj)
{
pw_log_debug("remove object %u", obj->id);
spa_list_remove(&obj->link);
spa_hook_remove(&obj->device_listener);
media-session: add device reservation for alsa Implement the device reservation DBus API. When we acquire the device name, set our device profile to 'On'. This adds our sources and sinks to the graph. When we lose the name, switch back to 'Off' and remove our nodes again. Move the session mamager stuff in a directory. Fixes #191
2019-09-30 21:23:29 +02:00
if (obj->seq != 0)
spa_hook_remove(&obj->sync_listener);
if (obj->reserve)
rd_device_destroy(obj->reserve);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
pw_proxy_destroy(obj->proxy);
monitor: unload spa handle instead of free()
2019-07-31 09:27:05 +02:00
pw_unload_spa_handle(obj->handle);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
free(obj);
}
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
static void alsa_udev_object_info(void *data, uint32_t id,
const struct spa_device_object_info *info)
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
{
struct monitor *monitor = data;
struct alsa_object *obj;
obj = alsa_find_object(monitor, id);
if (info == NULL) {
if (obj == NULL)
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
return;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
alsa_remove_object(monitor, obj);
} else if (obj == NULL) {
if ((obj = alsa_create_object(monitor, id, info)) == NULL)
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
return;
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
} else {
alsa_update_object(monitor, obj, info);
}
}
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
static const struct spa_device_events alsa_udev_events =
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
{
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
SPA_VERSION_DEVICE_EVENTS,
.object_info = alsa_udev_object_info,
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
};
static int alsa_start_monitor(struct impl *impl, struct monitor *monitor)
{
struct spa_handle *handle;
struct pw_core *core = impl->core;
int res;
void *iface;
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
handle = pw_core_load_spa_handle(core, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
if (handle == NULL) {
res = -errno;
goto out;
}
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
pw_log_error("can't get udev Device interface: %d", res);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
goto out_unload;
}
monitor->impl = impl;
monitor->handle = handle;
monitor->monitor = iface;
spa_list_init(&monitor->object_list);
monitor: remove monitor API and use device Remove the monitor API, we can use the device API for it. Make sure we support creating devices (like alsa) from another device (udev). Use new object.id to store the object id in the object properties. Use the port.id/node.id etc to make relations to other objects.
2019-09-20 13:04:14 +02:00
spa_device_add_listener(monitor->monitor, &monitor->listener, &alsa_udev_events, monitor);
session: handle monitor in the session Load the monitor in the session manager. Export devices to pipewire. Create nodes or a device in an adapter.
2019-07-10 20:24:11 +02:00
return 0;
out_unload:
pw_unload_spa_handle(handle);
out:
return res;
}
Reference in a new issue Copy permalink