mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
pipewire/src/tools/pipewire-monitor.c

736 lines
20 KiB
C
Raw Normal View History

pinos -> pipewire
2017-05-23 19:15:33 +02:00
/* PipeWire
Initial commit
2015-04-16 16:58:33 +02:00
*
Relicense as MIT/X11 Remove some obsolete files
2018-11-05 17:48:52 +01:00
* Copyright © 2018 Wim Taymans
Initial commit
2015-04-16 16:58:33 +02:00
*
Relicense as MIT/X11 Remove some obsolete files
2018-11-05 17:48:52 +01:00
* 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:
Initial commit
2015-04-16 16:58:33 +02:00
*
Relicense as MIT/X11 Remove some obsolete files
2018-11-05 17:48:52 +01:00
* 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.
Initial commit
2015-04-16 16:58:33 +02:00
*/
Make native protocol Remove DBus and work towards something like wayland. Remove more glib stuff from the client code
2016-11-24 17:00:42 +01:00
#include <stdio.h>
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
#include <signal.h>
Make native protocol Remove DBus and work towards something like wayland. Remove more glib stuff from the client code
2016-11-24 17:00:42 +01:00
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
#include <spa/utils/result.h>
debug: add specific format debug
2018-08-14 13:05:10 +02:00
#include <spa/debug/pod.h>
remove spalib
2018-08-14 12:33:53 +02:00
#include <spa/debug/format.h>
Remove dynamic types Do not use dynamic types anymore. The reason is that it's difficult: - to maintain a shared type database over a network. - the extra overhead when translating between processes and for maintaining the translation tables. - race conditions in translating in RT-threads, this is a problem because we want to make event streams. We now have simple enums with types and extension points for all types. This is also nicer to use in general. We don't need the mapper anymore or pass strings around as types. There is a parallel type info system to get more info about ids and enums and their hierarchy. It can also be used for debugging.
2018-08-23 17:47:57 +02:00
#include <spa/debug/types.h>
Make native protocol Remove DBus and work towards something like wayland. Remove more glib stuff from the client code
2016-11-24 17:00:42 +01:00
Don't use __ in defines or declarations, it's reserved SPA_TYPE -> SPA_TYPE_INFO for type info strings improve includes Fixes #115
2019-01-14 12:58:23 +01:00
#include <pipewire/pipewire.h>
move things around
2017-07-11 15:57:20 +02:00
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
struct proxy_data;
typedef void (*print_func_t) (struct proxy_data *data);
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct param {
struct spa_list link;
uint32_t id;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
int seq;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct spa_pod *param;
};
pinos -> pipewire
2017-05-23 19:15:33 +02:00
struct data {
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
struct pw_main_loop *loop;
pw_core -> pw_context The proxy API is the one that we would like to expose for applications and the other API is used internally when implementing modules or factories. The current pw_core object is really a context for all objects so name it that way. It also makes it possible to rename pw_core_proxy to pw_proxy later.
2019-12-10 18:19:56 +01:00
struct pw_context *context;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
rename core_proxy -> core Rename core_proxy to core and move the introspect and interface contents to core.h In an effort to promote the proxy API.
2019-12-11 07:46:59 +01:00
struct pw_core *core;
remote: remove some events Remove some events from the remote that we can find on the core_proxy. Use the core_proxy to get to the done and info events. Remove pw_remote_get_core_info(), we don't need this anymore now that we don't listen for the event and the user can keep track of this herself.
2019-01-10 10:08:14 +01:00
struct spa_hook core_listener;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pw_registry_proxy -> pw_registry
2019-12-11 09:44:48 +01:00
struct pw_registry *registry;
Move listeners to spa and rename to hooks The listeners are generally useful in spa, move it there and rename to hooks. Implement loop hooks with it. Fix some cleanup issues in stream and remote
2017-08-08 16:56:29 +02:00
struct spa_hook registry_listener;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
struct spa_list pending_list;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
struct proxy_data {
factory: add introspection
2017-09-18 09:35:00 +02:00
struct data *data;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
bool first;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
struct pw_proxy *proxy;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
uint32_t id;
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
uint32_t permissions;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
uint32_t version;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
uint32_t type;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
void *info;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pw_destroy_t destroy;
Move listeners to spa and rename to hooks The listeners are generally useful in spa, move it there and rename to hooks. Implement loop hooks with it. Fix some cleanup issues in stream and remote
2017-08-08 16:56:29 +02:00
struct spa_hook proxy_listener;
clean up proxy and resource api Remove override for resources, it can't work in general. Rename method to add_object_listener to add a listener for events/methods from the remote object. Rename some methods to _call to call the interface and _notify to notify the listeners. Remove unused client event to be notified of resource implementations.
2019-05-29 10:39:24 +02:00
struct spa_hook object_listener;
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
int pending_seq;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
struct spa_list pending_link;
print_func_t print_func;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct spa_list param_list;
pinos -> pipewire
2017-05-23 19:15:33 +02:00
};
Initial commit
2015-04-16 16:58:33 +02:00
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
static void add_pending(struct proxy_data *pd)
{
struct data *d = pd->data;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
if (pd->pending_seq == 0) {
spa_list_append(&d->pending_list, &pd->pending_link);
}
rename core_proxy -> core Rename core_proxy to core and move the introspect and interface contents to core.h In an effort to promote the proxy API.
2019-12-11 07:46:59 +01:00
pd->pending_seq = pw_core_sync(d->core, 0, pd->pending_seq);
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
}
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
static void remove_pending(struct proxy_data *pd)
{
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
if (pd->pending_seq != 0) {
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
spa_list_remove(&pd->pending_link);
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
pd->pending_seq = 0;
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
}
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void on_core_done(void *data, uint32_t id, int seq)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
{
struct data *d = data;
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
struct proxy_data *pd, *t;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
spa_list_for_each_safe(pd, t, &d->pending_list, pending_link) {
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
if (pd->pending_seq == seq) {
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
remove_pending(pd);
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
pd->print_func(pd);
}
}
}
static void clear_params(struct proxy_data *data)
{
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct param *p;
spa_list_consume(p, &data->param_list, link) {
spa_list_remove(&p->link);
free(p);
}
}
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
static void remove_params(struct proxy_data *data, uint32_t id, int seq)
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
{
struct param *p, *t;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
spa_list_for_each_safe(p, t, &data->param_list, link) {
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
if (p->id == id && seq != p->seq) {
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
spa_list_remove(&p->link);
free(p);
}
}
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
}
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
static void event_param(void *object, int seq, uint32_t id,
uint32_t index, uint32_t next, const struct spa_pod *param)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
{
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
struct proxy_data *data = object;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct param *p;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
/* remove all params with the same id and older seq */
remove_params(data, id, seq);
/* add new param */
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
p = malloc(sizeof(struct param) + SPA_POD_SIZE(param));
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
if (p == NULL) {
pw_log_error("can't add param: %m");
return;
}
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
p->id = id;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
p->seq = seq;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
p->param = SPA_MEMBER(p, sizeof(struct param), struct spa_pod);
memcpy(p->param, param, SPA_POD_SIZE(param));
spa_list_append(&data->param_list, &p->link);
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
}
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
static void print_params(struct proxy_data *data, char mark)
{
struct param *p;
printf("%c\tparams:\n", mark);
spa_list_for_each(p, &data->param_list, link) {
control: make control links many to many Output controls can be linked to many input controls and many input controls can receive input from many output controls. Keep the control link information inside the link.
2019-03-14 12:04:20 +01:00
printf("%c\t id:%u\n", mark, p->id);
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
if (spa_pod_is_object_type(p->param, SPA_TYPE_OBJECT_Format))
spa_debug_format(10, NULL, p->param);
else
spa_debug_pod(10, NULL, p->param);
}
}
global: add properties Add properties to global objects to make it easier to select what nodes and objects to bind too. They can also be used to implement permissions on the globals based on properties. Add more error handling in _register. Make more functions return a result code. Make a separate pw_module_register, like all other objects.
2018-01-19 11:18:17 +01:00
static void print_properties(const struct spa_dict *props, char mark)
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
{
Add more generic export-spa example Replace the v4l2 example with a more generic version that can add any spa node to a remote graph Make the dictionary items const Add some info to nodes and factories. Add the node info to the node properties. We can then set the media.class directly on the node, instead of letting the monitor set it. Debug node info in spa-inspect. Do async operation on the audiotestsrc and videotestsrc differently.
2017-09-07 19:55:22 +02:00
const struct spa_dict_item *item;
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
link: improve introspection
2017-08-27 17:58:25 +02:00
printf("%c\tproperties:\n", mark);
if (props == NULL || props->n_items == 0) {
printf("\t\tnone\n");
indent
2017-05-26 08:05:01 +02:00
return;
link: improve introspection
2017-08-27 17:58:25 +02:00
}
pinos-monitor: Improve output of removed objects Don't print NULL properties or formats Don't print property values for removed objects because they are all invalid anyway.
2016-02-01 16:29:56 +01:00
indent
2017-05-26 08:05:01 +02:00
spa_dict_for_each(item, props) {
Add support for NULL strings
2017-10-17 12:16:53 +02:00
if (item->value)
printf("%c\t\t%s = \"%s\"\n", mark, item->key, item->value);
else
printf("%c\t\t%s = (null)\n", mark, item->key);
indent
2017-05-26 08:05:01 +02:00
}
introspect: improve introspection API Add GAsyncReadyCallback to the introspection API. This makes it possible to report errors in the future. Don't pass NULL in the callback anymore now that we have the Ready callback. We also don't need to have a return value from the callback because now we can cancel any iteration by using the GCancelable. Make pinos_context_info_finish() to get the final result/error of introspection. Update tools for new API
2016-01-07 12:15:57 +01:00
}
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
#define MARK_CHANGE(f) ((print_mark && ((info)->change_mask & (f))) ? '*' : ' ')
pinos-monitor: Improve output of removed objects Don't print NULL properties or formats Don't print property values for removed objects because they are all invalid anyway.
2016-02-01 16:29:56 +01:00
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void on_core_info(void *data, const struct pw_core_info *info)
introspect: improve introspection API Add GAsyncReadyCallback to the introspection API. This makes it possible to report errors in the future. Don't pass NULL in the callback anymore now that we have the Ready callback. We also don't need to have a return value from the callback because now we can cancel any iteration by using the GCancelable. Make pinos_context_info_finish() to get the final result/error of introspection. Update tools for new API
2016-01-07 12:15:57 +01:00
{
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
bool print_all = true, print_mark = true;
indent
2017-05-26 08:05:01 +02:00
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s\n", spa_debug_type_find_name(pw_type_info(), PW_TYPE_INTERFACE_Core));
reorganize some struct members to remove holes
2019-02-08 12:01:50 +01:00
printf("\tcookie: %u\n", info->cookie);
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
printf("\tuser-name: \"%s\"\n", info->user_name);
printf("\thost-name: \"%s\"\n", info->host_name);
printf("\tversion: \"%s\"\n", info->version);
printf("\tname: \"%s\"\n", info->name);
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (print_all) {
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
print_properties(info->props, MARK_CHANGE(PW_CORE_CHANGE_MASK_PROPS));
indent
2017-05-26 08:05:01 +02:00
}
Work on introspection
2016-12-02 13:38:43 +01:00
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void module_event_info(void *object, const struct pw_module_info *info)
Work on introspection
2016-12-02 13:38:43 +01:00
{
factory: add introspection
2017-09-18 09:35:00 +02:00
struct proxy_data *data = object;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
bool print_all, print_mark;
Work on introspection
2016-12-02 13:38:43 +01:00
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
print_all = true;
if (data->info == NULL) {
printf("added:\n");
print_mark = false;
}
else {
printf("changed:\n");
print_mark = true;
}
info = data->info = pw_module_info_update(data->info, info);
Work on introspection
2016-12-02 13:38:43 +01:00
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
printf("\tid: %d\n", data->id);
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
printf("\tname: \"%s\"\n", info->name);
printf("\tfilename: \"%s\"\n", info->filename);
printf("\targs: \"%s\"\n", info->args);
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (print_all) {
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
print_properties(info->props, MARK_CHANGE(PW_MODULE_CHANGE_MASK_PROPS));
indent
2017-05-26 08:05:01 +02:00
}
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
}
cleanups Remove signals. Rename callbacks -> events, use listeners to listen for events. Callbacks are still used in spa for things you can listen to only once.
2017-08-04 16:49:13 +02:00
static const struct pw_module_proxy_events module_events = {
PW_VERSION_MODULE_PROXY_EVENTS,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
.info = module_event_info,
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
static void print_node(struct proxy_data *data)
client: add client object instrospection
2016-07-20 17:55:02 +02:00
{
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
struct pw_node_info *info = data->info;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
bool print_all, print_mark;
indent
2017-05-26 08:05:01 +02:00
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
print_all = true;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
if (data->first) {
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
printf("added:\n");
print_mark = false;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
data->first = false;
indent
2017-05-26 08:05:01 +02:00
}
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
else {
printf("changed:\n");
print_mark = true;
}
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
printf("\tid: %d\n", data->id);
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (print_all) {
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
print_params(data, MARK_CHANGE(PW_NODE_CHANGE_MASK_PARAMS));
printf("%c\tinput ports: %u/%u\n", MARK_CHANGE(PW_NODE_CHANGE_MASK_INPUT_PORTS),
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
info->n_input_ports, info->max_input_ports);
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
printf("%c\toutput ports: %u/%u\n", MARK_CHANGE(PW_NODE_CHANGE_MASK_OUTPUT_PORTS),
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
info->n_output_ports, info->max_output_ports);
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
printf("%c\tstate: \"%s\"", MARK_CHANGE(PW_NODE_CHANGE_MASK_STATE),
pw_node_state_as_string(info->state));
indent
2017-05-26 08:05:01 +02:00
if (info->state == PW_NODE_STATE_ERROR && info->error)
printf(" \"%s\"\n", info->error);
else
printf("\n");
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
print_properties(info->props, MARK_CHANGE(PW_NODE_CHANGE_MASK_PROPS));
indent
2017-05-26 08:05:01 +02:00
}
client: add client object instrospection
2016-07-20 17:55:02 +02:00
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void node_event_info(void *object, const struct pw_node_info *info)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
{
struct proxy_data *data = object;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct pw_node_info *old = data->info;
uint32_t i;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
if (old != NULL && info->params[i].flags == old->params[i].flags)
continue;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
remove_params(data, info->params[i].id, 0);
flags: change flag macros SPA_FLAG_CHECK -> SPA_FLAG_IS_SET SPA_FLAG_UNSET -> SPA_FLAG_CLEAR Add SPA_FLAG_UPDATE
2019-10-02 17:58:04 +02:00
if (!SPA_FLAG_IS_SET(info->params[i].flags, SPA_PARAM_INFO_READ))
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
continue;
pw_node_proxy_enum_params((struct pw_node_proxy*)data->proxy,
0, info->params[i].id, 0, 0, NULL);
}
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
add_pending(data);
}
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
data->info = pw_node_info_update(data->info, info);
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
if (data->pending_seq == 0)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
data->print_func(data);
}
cleanups Remove signals. Rename callbacks -> events, use listeners to listen for events. Callbacks are still used in spa for things you can listen to only once.
2017-08-04 16:49:13 +02:00
static const struct pw_node_proxy_events node_events = {
PW_VERSION_NODE_PROXY_EVENTS,
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
.info = node_event_info,
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
.param = event_param
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
};
static void print_port(struct proxy_data *data)
{
struct pw_port_info *info = data->info;
bool print_all, print_mark;
print_all = true;
if (data->first) {
printf("added:\n");
print_mark = false;
data->first = false;
}
else {
printf("changed:\n");
print_mark = true;
}
printf("\tid: %d\n", data->id);
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
printf("\tdirection: \"%s\"\n", pw_direction_as_string(info->direction));
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
if (print_all) {
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
print_params(data, MARK_CHANGE(PW_PORT_CHANGE_MASK_PARAMS));
print_properties(info->props, MARK_CHANGE(PW_PORT_CHANGE_MASK_PROPS));
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
}
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void port_event_info(void *object, const struct pw_port_info *info)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
{
struct proxy_data *data = object;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
struct pw_port_info *old = data->info;
uint32_t i;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
if (info->change_mask & PW_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
if (old != NULL && info->params[i].flags == old->params[i].flags)
continue;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
remove_params(data, info->params[i].id, 0);
flags: change flag macros SPA_FLAG_CHECK -> SPA_FLAG_IS_SET SPA_FLAG_UNSET -> SPA_FLAG_CLEAR Add SPA_FLAG_UPDATE
2019-10-02 17:58:04 +02:00
if (!SPA_FLAG_IS_SET(info->params[i].flags, SPA_PARAM_INFO_READ))
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
continue;
pw_port_proxy_enum_params((struct pw_port_proxy*)data->proxy,
0, info->params[i].id, 0, 0, NULL);
}
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
add_pending(data);
}
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
data->info = pw_port_info_update(data->info, info);
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
if (data->pending_seq == 0)
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
data->print_func(data);
}
static const struct pw_port_proxy_events port_events = {
PW_VERSION_PORT_PROXY_EVENTS,
.info = port_event_info,
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
.param = event_param
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void factory_event_info(void *object, const struct pw_factory_info *info)
factory: add introspection
2017-09-18 09:35:00 +02:00
{
struct proxy_data *data = object;
bool print_all, print_mark;
print_all = true;
if (data->info == NULL) {
printf("added:\n");
print_mark = false;
}
else {
printf("changed:\n");
print_mark = true;
}
info = data->info = pw_factory_info_update(data->info, info);
printf("\tid: %d\n", data->id);
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
factory: add introspection
2017-09-18 09:35:00 +02:00
printf("\tname: \"%s\"\n", info->name);
type: restore type info for pipewire types
2018-10-31 16:05:58 +00:00
printf("\tobject-type: %s/%d\n", spa_debug_type_find_name(pw_type_info(), info->type), info->version);
factory: add introspection
2017-09-18 09:35:00 +02:00
if (print_all) {
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
print_properties(info->props, MARK_CHANGE(PW_FACTORY_CHANGE_MASK_PROPS));
factory: add introspection
2017-09-18 09:35:00 +02:00
}
}
static const struct pw_factory_proxy_events factory_events = {
PW_VERSION_FACTORY_PROXY_EVENTS,
.info = factory_event_info
};
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void client_event_info(void *object, const struct pw_client_info *info)
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
{
factory: add introspection
2017-09-18 09:35:00 +02:00
struct proxy_data *data = object;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
bool print_all, print_mark;
indent
2017-05-26 08:05:01 +02:00
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
print_all = true;
if (data->info == NULL) {
printf("added:\n");
print_mark = false;
}
else {
printf("changed:\n");
print_mark = true;
indent
2017-05-26 08:05:01 +02:00
}
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
info = data->info = pw_client_info_update(data->info, info);
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
printf("\tid: %d\n", data->id);
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (print_all) {
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
print_properties(info->props, MARK_CHANGE(PW_CLIENT_CHANGE_MASK_PROPS));
indent
2017-05-26 08:05:01 +02:00
}
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
}
pw_client_proxy -> pw_client
2019-12-11 14:53:39 +01:00
static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_EVENTS,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
.info = client_event_info
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void link_event_info(void *object, const struct pw_link_info *info)
client: add client object instrospection
2016-07-20 17:55:02 +02:00
{
factory: add introspection
2017-09-18 09:35:00 +02:00
struct proxy_data *data = object;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
bool print_all, print_mark;
indent
2017-05-26 08:05:01 +02:00
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
print_all = true;
if (data->info == NULL) {
printf("added:\n");
print_mark = false;
}
else {
printf("changed:\n");
print_mark = true;
indent
2017-05-26 08:05:01 +02:00
}
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
info = data->info = pw_link_info_update(data->info, info);
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
printf("\tid: %d\n", data->id);
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
monitor: lookup type names
2018-11-22 13:35:30 +01:00
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
printf("\toutput-node-id: %u\n", info->output_node_id);
printf("\toutput-port-id: %u\n", info->output_port_id);
printf("\tinput-node-id: %u\n", info->input_node_id);
printf("\tinput-port-id: %u\n", info->input_port_id);
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (print_all) {
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
printf("%c\tstate: \"%s\"", MARK_CHANGE(PW_LINK_CHANGE_MASK_STATE),
pw_link_state_as_string(info->state));
link: add link state and error to info Notify when state changes
2018-10-03 19:29:11 +02:00
if (info->state == PW_LINK_STATE_ERROR && info->error)
printf(" \"%s\"\n", info->error);
else
printf("\n");
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
printf("%c\tformat:\n", MARK_CHANGE(PW_LINK_CHANGE_MASK_FORMAT));
Improve introspection Move introspectable info to the node and link. Only enumerate the device formats once. Change some field names. Pass link format in introspection
2017-06-02 10:40:43 +02:00
if (info->format)
Remove dynamic types Do not use dynamic types anymore. The reason is that it's difficult: - to maintain a shared type database over a network. - the extra overhead when translating between processes and for maintaining the translation tables. - race conditions in translating in RT-threads, this is a problem because we want to make event streams. We now have simple enums with types and extension points for all types. This is also nicer to use in general. We don't need the mapper anymore or pass strings around as types. There is a parallel type info system to get more info about ids and enums and their hierarchy. It can also be used for debugging.
2018-08-23 17:47:57 +02:00
spa_debug_format(2, NULL, info->format);
Improve introspection Move introspectable info to the node and link. Only enumerate the device formats once. Change some field names. Pass link format in introspection
2017-06-02 10:40:43 +02:00
else
link: improve introspection
2017-08-27 17:58:25 +02:00
printf("\t\tnone\n");
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
print_properties(info->props, MARK_CHANGE(PW_LINK_CHANGE_MASK_PROPS));
indent
2017-05-26 08:05:01 +02:00
}
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
}
cleanups Remove signals. Rename callbacks -> events, use listeners to listen for events. Callbacks are still used in spa for things you can listen to only once.
2017-08-04 16:49:13 +02:00
static const struct pw_link_proxy_events link_events = {
PW_VERSION_LINK_PROXY_EVENTS,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
.info = link_event_info
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
static void print_device(struct proxy_data *data)
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
{
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
struct pw_device_info *info = data->info;
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
bool print_all, print_mark;
print_all = true;
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
if (data->first) {
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
printf("added:\n");
print_mark = false;
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
data->first = false;
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
}
else {
printf("changed:\n");
print_mark = true;
}
printf("\tid: %d\n", data->id);
printf("\tpermissions: %c%c%c\n", data->permissions & PW_PERM_R ? 'r' : '-',
data->permissions & PW_PERM_W ? 'w' : '-',
data->permissions & PW_PERM_X ? 'x' : '-');
printf("\ttype: %s (version %d)\n",
spa_debug_type_find_name(pw_type_info(), data->type), data->version);
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
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
if (print_all) {
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
print_params(data, MARK_CHANGE(PW_DEVICE_CHANGE_MASK_PARAMS));
print_properties(info->props, MARK_CHANGE(PW_DEVICE_CHANGE_MASK_PROPS));
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
}
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void device_event_info(void *object, const struct pw_device_info *info)
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
{
struct proxy_data *data = object;
struct pw_device_info *old = data->info;
uint32_t i;
if (info->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
if (old != NULL && info->params[i].flags == old->params[i].flags)
continue;
monitor: improve param handling When we receive a param change and the param is unreadable, remove the params. When we get a param update, always remove the old params.
2019-03-14 16:42:59 +01:00
remove_params(data, info->params[i].id, 0);
flags: change flag macros SPA_FLAG_CHECK -> SPA_FLAG_IS_SET SPA_FLAG_UNSET -> SPA_FLAG_CLEAR Add SPA_FLAG_UPDATE
2019-10-02 17:58:04 +02:00
if (!SPA_FLAG_IS_SET(info->params[i].flags, SPA_PARAM_INFO_READ))
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
continue;
pw_device_proxy_enum_params((struct pw_device_proxy*)data->proxy,
0, info->params[i].id, 0, 0, NULL);
}
add_pending(data);
}
data->info = pw_device_info_update(data->info, info);
if (data->pending_seq == 0)
data->print_func(data);
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
}
static const struct pw_device_proxy_events device_events = {
PW_VERSION_DEVICE_PROXY_EVENTS,
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
.info = device_event_info,
.param = event_param
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
};
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
static void
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
destroy_proxy (void *data)
Improve introspection Add instrospection of client and source-output. Add properties to source-output and to CreateSourceOutput/Input Add helper to fill properties of context. Add client-name to pinossrc and pinossink Improve test-subscribe to show all new introspection details.
2015-07-28 17:05:03 +02:00
{
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
struct proxy_data *pd = data;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
clear_params(pd);
remove_pending(pd);
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
if (pd->info == NULL)
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
return;
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
if (pd->destroy)
pd->destroy(pd->info);
pd->info = NULL;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
}
Work on introspection
2016-12-02 13:38:43 +01:00
cleanups Remove signals. Rename callbacks -> events, use listeners to listen for events. Callbacks are still used in spa for things you can listen to only once.
2017-08-04 16:49:13 +02:00
static const struct pw_proxy_events proxy_events = {
PW_VERSION_PROXY_EVENTS,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
.destroy = destroy_proxy,
};
Implement access control Move send and dispatch functions to the implementation. This makes it possible to place an access check before sending and dispatching. Add module-access that allows to bind and notify on globals owned by the client.
2017-01-10 17:12:53 +01: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
static void registry_event_global(void *data, uint32_t id,
global: add properties Add properties to global objects to make it easier to select what nodes and objects to bind too. They can also be used to implement permissions on the globals based on properties. Add more error handling in _register. Make more functions return a result code. Make a separate pw_module_register, like all other objects.
2018-01-19 11:18:17 +01:00
uint32_t permissions, uint32_t type, uint32_t version,
const struct spa_dict *props)
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
{
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
struct data *d = data;
struct pw_proxy *proxy;
pass the global type as an id instead of string
2017-07-11 18:41:22 +02:00
uint32_t client_version;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
const void *events;
struct proxy_data *pd;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pw_destroy_t destroy;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
print_func_t print_func = NULL;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
monitor: lookup type names
2018-11-22 13:35:30 +01:00
switch (type) {
case PW_TYPE_INTERFACE_Node:
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
events = &node_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_NODE_PROXY;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
destroy = (pw_destroy_t) pw_node_info_free;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
print_func = print_node;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
case PW_TYPE_INTERFACE_Port:
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
events = &port_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_PORT_PROXY;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
destroy = (pw_destroy_t) pw_port_info_free;
print_func = print_port;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
case PW_TYPE_INTERFACE_Module:
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
events = &module_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_MODULE_PROXY;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
destroy = (pw_destroy_t) pw_module_info_free;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
case PW_TYPE_INTERFACE_Device:
events = &device_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_DEVICE_PROXY;
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
destroy = (pw_destroy_t) pw_device_info_free;
node: make add_listener method Make struct spa_node_events for events emited from the main thread and keep the spa_node_callbacks for the data thread callbacks. The add_listener method installs the events and it's possible to install multiple handles. Adding a listener first emits the info and port_info events when installed, similar to how the PipeWire proxy bind works. This removes the need for the spa_pending_queue and makes it easier to implement the _sync versions. Add some helpers to make it easier for plugins to emit all the info to new listeners. Use the listeners for devices as well.
2019-03-01 12:00:42 +01:00
print_func = print_device;
device: add device object Make a device object, let the v4l2 monitor create device objects The device object is responsible for dynamically creating nodes.
2018-11-23 12:43:47 +01:00
break;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
case PW_TYPE_INTERFACE_Factory:
factory: add introspection
2017-09-18 09:35:00 +02:00
events = &factory_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_FACTORY_PROXY;
factory: add introspection
2017-09-18 09:35:00 +02:00
destroy = (pw_destroy_t) pw_factory_info_free;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
case PW_TYPE_INTERFACE_Client:
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
events = &client_events;
pw_client_proxy -> pw_client
2019-12-11 14:53:39 +01:00
client_version = PW_VERSION_CLIENT;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
destroy = (pw_destroy_t) pw_client_info_free;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
case PW_TYPE_INTERFACE_Link:
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
events = &link_events;
interface: add an interface struct The interface struct has the type,version and methods of the interface. Make spa interfaces extend from spa_interface and make a separate structure for the methods. Pass a generic void* as the first argument of methods, like we don in PipeWire. Bundle the methods + implementation in a versioned inteface and use that to invoke methods. This way we can do version checks on the methods. Make resource and proxy interfaces that we can can call. We can then make the core interfaces independent on proxy/resource and hide them in the lower layers. Add add_listener method to methods of core interfaces, just like SPA.
2019-05-20 16:11:23 +02:00
client_version = PW_VERSION_LINK_PROXY;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
destroy = (pw_destroy_t) pw_link_info_free;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
break;
default:
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
printf("added:\n");
printf("\tid: %u\n", id);
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
printf("\tpermissions: %c%c%c\n", permissions & PW_PERM_R ? 'r' : '-',
permissions & PW_PERM_W ? 'w' : '-',
permissions & PW_PERM_X ? 'x' : '-');
type: restore type info for pipewire types
2018-10-31 16:05:58 +00:00
printf("\ttype: %s (version %d)\n", spa_debug_type_find_name(pw_type_info(), type), version);
global: add properties Add properties to global objects to make it easier to select what nodes and objects to bind too. They can also be used to implement permissions on the globals based on properties. Add more error handling in _register. Make more functions return a result code. Make a separate pw_module_register, like all other objects.
2018-01-19 11:18:17 +01:00
print_properties(props, ' ');
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
return;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
}
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
pw_registry_proxy -> pw_registry
2019-12-11 09:44:48 +01:00
proxy = pw_registry_bind(d->registry, id, type,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
client_version,
sizeof(struct proxy_data));
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
if (proxy == NULL)
goto no_mem;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pd = pw_proxy_get_user_data(proxy);
factory: add introspection
2017-09-18 09:35:00 +02:00
pd->data = d;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
pd->first = true;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pd->proxy = proxy;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
pd->id = id;
Use more fine grained access control Make it possible to add more permissions to an object than just visible or not. Pass these permissions to the client. This way we can make a difference between being able to see and read, modify or query an object. More permissions can be added later when needed. Because the permissions is set on the resource by the access control module, the implementations can check if the right permission is set before doing anything.
2017-08-01 17:09:57 +02:00
pd->permissions = permissions;
API cleanups Fix docs Add some more versions to interfaces Make types for the various proxy object + inline methods that does type checking and create proxys etc. Set owner client of client-nodes in the properties Pass type to bind to in create-node Don't place global id in the info structs Improve registration of marshal functions Pass more types around as ids
2017-07-13 15:21:52 +02:00
pd->version = version;
monitor: lookup type names
2018-11-22 13:35:30 +01:00
pd->type = type;
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
pd->destroy = destroy;
more async improvements Make the sequence number an int. Keep track of the last received seq number and pass it in error replies. Pass seq in for_each methods.
2019-02-25 16:25:27 +01:00
pd->pending_seq = 0;
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
pd->print_func = print_func;
node: add port and node params Add a new struct spa_param_info that lists the available params on a node/port and if they are readable/writable/updated. We can use this to replace and improve the PARAM_List and also to notify property change and updates. Update elements and code to deal with this new param stuff. Add port and node info to most elements and signal changes. Use async enum_params in -inspect and use the param info to know which ones to enumerate. Use the port info to know what parameters to update in the remote-node.
2019-02-27 16:43:01 +01:00
spa_list_init(&pd->param_list);
clean up proxy and resource api Remove override for resources, it can't work in general. Rename method to add_object_listener to add a listener for events/methods from the remote object. Rename some methods to _call to call the interface and _notify to notify the listeners. Remove unused client event to be notified of resource implementations.
2019-05-29 10:39:24 +02:00
pw_proxy_add_object_listener(proxy, &pd->object_listener, events, pd);
cleanups Remove signals. Rename callbacks -> events, use listeners to listen for events. Callbacks are still used in spa for things you can listen to only once.
2017-08-04 16:49:13 +02:00
pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd);
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
return;
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
no_mem:
printf("failed to create proxy");
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
return;
subscribe: rework some more Track senders in the subscribe object and aggregate events from all connected clients. This allows each client to get a complete view of all the objects of pulsevideo. With all the source objects available, we can then to the selection of the source on each client. Remove the CreatSourceOutput on the Client1 object but let the client select a good source and call CreateSourceOutput directly on the source. This avoid going through the server to get a connection and the client can just as well select a source. Add a state property to the source and make it such that it can do async state changes. Remove the source provider object, each client can now directly see the objects of another clients so there is no need for intermediate objects in the server.
2015-04-27 09:05:14 +02:00
}
interfaces: make events return void Events are dispatched with hooks and have no return value. Make it possible to get the last resource and proxy sender value for where we need it.
2019-03-01 14:04:05 +01:00
static void registry_event_global_remove(void *object, uint32_t id)
Initial commit
2015-04-16 16:58:33 +02:00
{
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
printf("removed:\n");
printf("\tid: %u\n", id);
Initial commit
2015-04-16 16:58:33 +02:00
}
pw_registry_proxy -> pw_registry
2019-12-11 09:44:48 +01:00
static const struct pw_registry_events registry_events = {
PW_VERSION_REGISTRY_EVENTS,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
.global = registry_event_global,
.global_remove = registry_event_global_remove,
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
};
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
static void on_core_error(void *_data, uint32_t id, int seq, int res, const char *message)
Initial commit
2015-04-16 16:58:33 +02:00
{
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
struct data *data = _data;
indent
2017-05-26 08:05:01 +02:00
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
pw_main_loop_quit(data->loop);
indent
2017-05-26 08:05:01 +02:00
}
Initial commit
2015-04-16 16:58:33 +02:00
}
rename core_proxy -> core Rename core_proxy to core and move the introspect and interface contents to core.h In an effort to promote the proxy API.
2019-12-11 07:46:59 +01:00
static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS,
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
.info = on_core_info,
.done = on_core_done,
.error = on_core_error,
Make structure private Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
2017-08-04 10:18:54 +02:00
};
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
static void do_quit(void *data, int signal_number)
{
struct data *d = data;
pw_main_loop_quit(d->loop);
}
indent
2017-05-26 08:05:01 +02:00
int main(int argc, char *argv[])
Initial commit
2015-04-16 16:58:33 +02:00
{
Work on unifying client and server Remove context and extensions, make client API also use the core. Make a new pw_remote object that keeps connections with remote instances. Remove introspection API, it's just as easy to connect to the registry and get updates like that. Expand the protocol a little to make it useful for making listeners and connections. Move protocol specific connection to the module. Make some new convenience methods. Make a factory to create nodes from spa objects Add an example of a local pipeline displaying a v4l2 source.
2017-07-11 12:24:03 +02:00
struct data data = { 0 };
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
struct pw_loop *l;
man: update man pages Add man page for pipewire-cli
2017-09-19 10:19:53 +02:00
struct pw_properties *props = NULL;
Initial commit
2015-04-16 16:58:33 +02:00
indent
2017-05-26 08:05:01 +02:00
pw_init(&argc, &argv);
Initial commit
2015-04-16 16:58:33 +02:00
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
data.loop = pw_main_loop_new(NULL);
Cleanups Make separate _register function so that we can first configure the object before making it publicly visible.
2017-09-18 11:54:25 +02:00
if (data.loop == NULL)
return -1;
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
l = pw_main_loop_get_loop(data.loop);
pw_loop_add_signal(l, SIGINT, do_quit, &data);
pw_loop_add_signal(l, SIGTERM, do_quit, &data);
pw_core -> pw_context The proxy API is the one that we would like to expose for applications and the other API is used internally when implementing modules or factories. The current pw_core object is really a context for all objects so name it that way. It also makes it possible to rename pw_core_proxy to pw_proxy later.
2019-12-10 18:19:56 +01:00
data.context = pw_context_new(l, NULL, 0);
if (data.context == NULL)
Cleanups Make separate _register function so that we can first configure the object before making it publicly visible.
2017-09-18 11:54:25 +02:00
return -1;
man: update man pages Add man page for pipewire-cli
2017-09-19 10:19:53 +02:00
if (argc > 1)
keys: add keys.h with defines and docs Add a keys.h file that lists and documents all keys available to be used in properties.
2019-05-24 15:47:48 +02:00
props = pw_properties_new(PW_KEY_REMOTE_NAME, argv[1], NULL);
man: update man pages Add man page for pipewire-cli
2017-09-19 10:19:53 +02:00
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
spa_list_init(&data.pending_list);
Initial commit
2015-04-16 16:58:33 +02:00
rename core_proxy -> core Rename core_proxy to core and move the introspect and interface contents to core.h In an effort to promote the proxy API.
2019-12-11 07:46:59 +01:00
data.core = pw_context_connect(data.context, props, 0);
if (data.core == NULL)
Cleanups Make separate _register function so that we can first configure the object before making it publicly visible.
2017-09-18 11:54:25 +02:00
return -1;
Make native protocol Remove DBus and work towards something like wayland. Remove more glib stuff from the client code
2016-11-24 17:00:42 +01:00
rename core_proxy -> core Rename core_proxy to core and move the introspect and interface contents to core.h In an effort to promote the proxy API.
2019-12-11 07:46:59 +01:00
pw_core_add_listener(data.core,
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
&data.core_listener,
&core_events, &data);
pw_registry_proxy -> pw_registry
2019-12-11 09:44:48 +01:00
data.registry = pw_core_get_registry(data.core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(data.registry,
core_proxy: prepare to rename pw_remote -> pw_core_proxy The pw_remote object is really a wrapper around the pw_core_proxy. The events it emits are also available in the core proxy and are generally awkward to use. With some clever new pw_core_proxy_* methods and a pw_core_connect to create the core_proxy, we can convert all code away from pw_remote. This is a first step in this conversion, using the pw_remote behind the scenes. It leaks into some places because it really needs to become its own struct in a next step.
2019-12-06 11:48:40 +01:00
&data.registry_listener,
&registry_events, &data);
params: make method on node and port to enum params Do not pass the params of the node in the node_info, instead, make a method to enumerate the params. This makes it possible for clients to only enumerate what they need and when they need it. Improve introspection of a port, add the name and properties. Add an enum_param method on the port that can be used to enumerate port formats. Change -monitor and -cli and add support for enum_params on the node and port.
2018-02-20 10:31:55 +01:00
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
pw_main_loop_run(data.loop);
Initial commit
2015-04-16 16:58:33 +02:00
pw_core -> pw_context The proxy API is the one that we would like to expose for applications and the other API is used internally when implementing modules or factories. The current pw_core object is really a context for all objects so name it that way. It also makes it possible to rename pw_core_proxy to pw_proxy later.
2019-12-10 18:19:56 +01:00
pw_context_destroy(data.context);
Fix crash on shutdown Sometimes we insert NULL into the client object map to mark the object freed. Now that the map also returns those NULL's, don't try to free them. Small cleanups Make some port methods private.
2017-09-11 09:48:13 +02:00
pw_main_loop_destroy(data.loop);
Initial commit
2015-04-16 16:58:33 +02:00
indent
2017-05-26 08:05:01 +02:00
return 0;
Initial commit
2015-04-16 16:58:33 +02:00
}
Reference in a new issue Copy permalink