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

704 lines
19 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
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
move things around
2017-07-11 15:57:20 +02:00
#include <pipewire/pipewire.h>
Implement protocol extensions Add hooks that contain protocol specific interfaces that can be used to extend the protocol. This makes it possible to add new interfaces to the protocol and implement the protocol specific data transport. Move these protocol specific extension to the extensions directory.
2017-07-12 18:04:00 +02:00
#include <pipewire/interfaces.h>
#include <pipewire/type.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);
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;
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 pw_core *core;
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
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 pw_remote *remote;
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 remote_listener;
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 pw_core_proxy *core_proxy;
struct pw_registry_proxy *registry_proxy;
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
uint32_t seq;
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;
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
uint32_t parent_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;
struct spa_hook proxy_proxy_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
uint32_t pending_seq;
struct spa_list pending_link;
print_func_t print_func;
uint32_t n_params;
struct spa_pod **params;
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;
spa_list_append(&d->pending_list, &pd->pending_link);
pd->pending_seq = ++d->seq;
pw_core_proxy_sync(d->core_proxy, pd->pending_seq);
}
monitor: safely remove pending requests
2018-04-19 20:02:06 +02:00
static void remove_pending(struct proxy_data *pd)
{
if (pd->pending_seq != SPA_ID_INVALID) {
spa_list_remove(&pd->pending_link);
pd->pending_seq = SPA_ID_INVALID;
}
}
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 on_sync_reply(void *data, uint32_t seq)
{
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)
{
fix sign confusion
2019-01-07 15:52:42 +01:00
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
for (i = 0; i < data->n_params; i++)
free(data->params[i]);
free(data->params);
data->n_params = 0;
data->params = NULL;
}
static void add_param(struct proxy_data *data, const struct spa_pod *param)
{
uint32_t idx = data->n_params++;
data->params = realloc(data->params, sizeof(struct spa_pod *) * data->n_params);
data->params[idx] = pw_spa_pod_copy(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
}
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
#define MARK_CHANGE(f) ((print_mark && ((info)->change_mask & (1 << (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
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
static void on_info_changed(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
{
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 = true, print_mark = false;
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));
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) {
indent
2017-05-26 08:05:01 +02:00
printf("%c\tuser-name: \"%s\"\n", MARK_CHANGE(0), info->user_name);
printf("%c\thost-name: \"%s\"\n", MARK_CHANGE(1), info->host_name);
printf("%c\tversion: \"%s\"\n", MARK_CHANGE(2), info->version);
printf("%c\tname: \"%s\"\n", MARK_CHANGE(3), info->name);
printf("%c\tcookie: %u\n", MARK_CHANGE(4), info->cookie);
print_properties(info->props, MARK_CHANGE(5));
}
Work on introspection
2016-12-02 13:38:43 +01:00
}
add const to info
2019-01-09 17:49:45 +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);
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
printf("\tparent_id: %d\n", data->parent_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) {
printf("%c\tname: \"%s\"\n", MARK_CHANGE(0), info->name);
printf("%c\tfilename: \"%s\"\n", MARK_CHANGE(1), info->filename);
printf("%c\targs: \"%s\"\n", MARK_CHANGE(2), info->args);
print_properties(info->props, MARK_CHANGE(3));
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);
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
printf("\tparent_id: %d\n", data->parent_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) {
fix sign confusion
2019-01-07 15:52:42 +01:00
uint32_t i;
indent
2017-05-26 08:05:01 +02:00
printf("%c\tname: \"%s\"\n", MARK_CHANGE(0), info->name);
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
printf("%c\tparams:\n", MARK_CHANGE(5));
for (i = 0; i < data->n_params; i++) {
More type cleanups SPA_ID_* -> SPA_TYPE_*. We use 'type' for all registered types. ID refers to either a registered type or an enum. Improve introspection of object ids. Make 0 an invalid enum and use it to look up the object id type. Move some type-info files together. Swap type and id of the object, we first specify the type and then the id because the meaning of the id depends on the object type.
2018-08-27 15:03:11 +02:00
if (spa_pod_is_object_type(data->params[i], SPA_TYPE_OBJECT_Format))
Make media type and subtype properties This is easier to debug and we only want properties in objects in the future.
2018-08-29 18:08:52 +02:00
spa_debug_format(10, NULL, data->params[i]);
remove spalib
2018-08-14 12:33:53 +02:00
else
debug: allow custom type root
2018-08-30 12:01:52 +02:00
spa_debug_pod(10, NULL, data->params[i]);
Unify props, params and formats Make enum_params and set_param to configure properties, format and other parameters. This allows us to remove some duplicate code and make the properties and parameters much more extensible. Use the object id to mark the id of the parameter. Remove the spa_format and spa_props. We can now make the client-node easier by merging the various format methods into the params. Make the stream API more powerful now that we can pass params around.
2017-11-07 17:39:31 +01: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
printf("%c\tinput ports: %u/%u\n", MARK_CHANGE(1),
info->n_input_ports, info->max_input_ports);
printf("%c\toutput ports: %u/%u\n", MARK_CHANGE(2),
info->n_output_ports, info->max_output_ports);
printf("%c\tstate: \"%s\"", MARK_CHANGE(3), 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");
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_properties(info->props, MARK_CHANGE(4));
indent
2017-05-26 08:05:01 +02:00
}
client: add client object instrospection
2016-07-20 17:55:02 +02:00
}
add const to info
2019-01-09 17:49:45 +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;
introspect: remove ENUM_PARAM change Remove the ENUM_PARAM change bit, we want to do this with a specific event later that would allow us to specify which params changed etc.
2018-11-28 17:31:00 +01:00
bool is_new = data->info == 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
data->info = pw_node_info_update(data->info, info);
introspect: remove ENUM_PARAM change Remove the ENUM_PARAM change bit, we want to do this with a specific event later that would allow us to specify which params changed etc.
2018-11-28 17:31:00 +01:00
if (is_new) {
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
pw_node_proxy_enum_params((struct pw_node_proxy*)data->proxy,
More type fixes Param ids and IO ids are now simple enums. Move some type info in one place, delete some type-info files Fix type debug Make audio layout an enum Mark more enums as enums in types so they show us with their names in the debug.
2018-08-25 12:08:29 +02:00
SPA_PARAM_List, 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);
}
if (data->pending_seq == SPA_ID_INVALID)
data->print_func(data);
}
static void node_event_param(void *object, uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct proxy_data *data = object;
add_param(data, param);
}
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,
.param = node_event_param
};
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("\tparent_id: %d\n", data->parent_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);
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) {
fix sign confusion
2019-01-07 15:52:42 +01:00
uint32_t i;
audio: remove layout from audio Make special format types for planar and interleaved instead of having a field. Add enum for audio channel positions Add some default audio channel layouts Place the channel layout in the audio format when possible alsa: place audio channel positions in format Add sse optimized channel mixing for some common cases Remove name from port info, it's not mandatory and in the properties Add direction to port info
2018-09-13 17:03:56 +02:00
printf(" \tdirection: \"%s\"\n", pw_direction_as_string(info->direction));
properties: return if property changed make property_set functions return 1 if there was a change. Only emit property change notifications when something actually changed. Try to only copy property value when needed.
2018-10-04 15:18:31 +02:00
printf("%c\tparams:\n", MARK_CHANGE(2));
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
for (i = 0; i < data->n_params; i++) {
More type cleanups SPA_ID_* -> SPA_TYPE_*. We use 'type' for all registered types. ID refers to either a registered type or an enum. Improve introspection of object ids. Make 0 an invalid enum and use it to look up the object id type. Move some type-info files together. Swap type and id of the object, we first specify the type and then the id because the meaning of the id depends on the object type.
2018-08-27 15:03:11 +02:00
if (spa_pod_is_object_type(data->params[i], SPA_TYPE_OBJECT_Format))
Make media type and subtype properties This is easier to debug and we only want properties in objects in the future.
2018-08-29 18:08:52 +02:00
spa_debug_format(12, NULL, data->params[i]);
remove spalib
2018-08-14 12:33:53 +02:00
else
debug: allow custom type root
2018-08-30 12:01:52 +02:00
spa_debug_pod(12, NULL, data->params[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
}
print_properties(info->props, MARK_CHANGE(1));
}
}
add const to info
2019-01-09 17:49:45 +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;
introspect: remove ENUM_PARAM change Remove the ENUM_PARAM change bit, we want to do this with a specific event later that would allow us to specify which params changed etc.
2018-11-28 17:31:00 +01:00
bool is_new = data->info == 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
data->info = pw_port_info_update(data->info, info);
introspect: remove ENUM_PARAM change Remove the ENUM_PARAM change bit, we want to do this with a specific event later that would allow us to specify which params changed etc.
2018-11-28 17:31:00 +01:00
if (is_new) {
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
pw_port_proxy_enum_params((struct pw_port_proxy*)data->proxy,
More type fixes Param ids and IO ids are now simple enums. Move some type info in one place, delete some type-info files Fix type debug Make audio layout an enum Mark more enums as enums in types so they show us with their names in the debug.
2018-08-25 12:08:29 +02:00
SPA_PARAM_EnumFormat, 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);
}
if (data->pending_seq == SPA_ID_INVALID)
data->print_func(data);
}
static void port_event_param(void *object, uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct proxy_data *data = object;
add_param(data, param);
}
static const struct pw_port_proxy_events port_events = {
PW_VERSION_PORT_PROXY_EVENTS,
.info = port_event_info,
.param = port_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
};
add const to info
2019-01-09 17:49:45 +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("\tparent_id: %d\n", data->parent_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);
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) {
print_properties(info->props, MARK_CHANGE(0));
}
}
static const struct pw_factory_proxy_events factory_events = {
PW_VERSION_FACTORY_PROXY_EVENTS,
.info = factory_event_info
};
add const to info
2019-01-09 17:49:45 +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);
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
printf("\tparent_id: %d\n", data->parent_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) {
print_properties(info->props, MARK_CHANGE(0));
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_client_proxy_events client_events = {
PW_VERSION_CLIENT_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 = 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
};
add const to info
2019-01-09 17:49:45 +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);
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
printf("\tparent_id: %d\n", data->parent_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) {
indent
2017-05-26 08:05:01 +02:00
printf("%c\toutput-node-id: %u\n", MARK_CHANGE(0), info->output_node_id);
Make scheduler more generic Add some callbacks to trigger push and pull in a graph Remove the scheduler, make some implementations of graph push/pull functions. Add some properties to jack clients and nodes Fix the parent of the clients. Notify link format changes
2017-08-20 18:33:07 +02:00
printf("%c\toutput-port-id: %u\n", MARK_CHANGE(0), info->output_port_id);
printf("%c\tinput-node-id: %u\n", MARK_CHANGE(1), info->input_node_id);
printf("%c\tinput-port-id: %u\n", MARK_CHANGE(1), info->input_port_id);
link: add link state and error to info Notify when state changes
2018-10-03 19:29:11 +02:00
printf("%c\tstate: \"%s\"", MARK_CHANGE(2), pw_link_state_as_string(info->state));
if (info->state == PW_LINK_STATE_ERROR && info->error)
printf(" \"%s\"\n", info->error);
else
printf("\n");
printf("%c\tformat:\n", MARK_CHANGE(3));
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");
link: add link state and error to info Notify when state changes
2018-10-03 19:29:11 +02:00
print_properties(info->props, MARK_CHANGE(4));
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
};
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
add const to info
2019-01-09 17:49:45 +01:00
static void device_event_info(void *object, const struct pw_device_info *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
{
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_device_info_update(data->info, info);
printf("\tid: %d\n", data->id);
printf("\tparent_id: %d\n", data->parent_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);
if (print_all) {
print_properties(info->props, MARK_CHANGE(0));
}
}
static const struct pw_device_proxy_events device_events = {
PW_VERSION_DEVICE_PROXY_EVENTS,
.info = device_event_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
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
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
static void registry_event_global(void *data, uint32_t id, uint32_t parent_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;
client_version = PW_VERSION_NODE;
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;
client_version = PW_VERSION_PORT;
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;
client_version = PW_VERSION_MODULE;
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;
client_version = PW_VERSION_DEVICE;
destroy = (pw_destroy_t) pw_device_info_free;
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;
client_version = PW_VERSION_FACTORY;
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;
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;
client_version = PW_VERSION_LINK;
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);
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
printf("\tparent_id: %d\n", parent_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, ' ');
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
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
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
proxy = pw_registry_proxy_bind(d->registry_proxy, id, type,
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;
Add parent_id Add parent_id to globals to make hierarchy of interfaces. We can use this to group interfaces or to describe the owner.
2017-07-18 14:58:14 +02:00
pd->parent_id = parent_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;
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->pending_seq = SPA_ID_INVALID;
pd->print_func = print_func;
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_proxy_listener(proxy, &pd->proxy_proxy_listener, events, pd);
pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd);
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;
no_mem:
printf("failed to create proxy");
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
}
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
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
}
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_registry_proxy_events registry_events = {
PW_VERSION_REGISTRY_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
.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
};
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
static void on_state_changed(void *_data, enum pw_remote_state old,
enum pw_remote_state state, const char *error)
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
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
switch (state) {
move things around
2017-07-11 15:57:20 +02:00
case PW_REMOTE_STATE_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
printf("remote error: %s\n", error);
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
break;
move things around
2017-07-11 15:57:20 +02:00
case PW_REMOTE_STATE_CONNECTED:
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
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
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
data->core_proxy = pw_remote_get_core_proxy(data->remote);
data->registry_proxy = pw_core_proxy_get_registry(data->core_proxy,
More type cleanups SPA_ID_* -> SPA_TYPE_*. We use 'type' for all registered types. ID refers to either a registered type or an enum. Improve introspection of object ids. Make 0 an invalid enum and use it to look up the object id type. Move some type-info files together. Swap type and id of the object, we first specify the type and then the id because the meaning of the id depends on the object type.
2018-08-27 15:03:11 +02:00
PW_TYPE_INTERFACE_Registry,
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_VERSION_REGISTRY, 0);
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
pw_registry_proxy_add_listener(data->registry_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
&data->registry_listener,
&registry_events, 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
break;
indent
2017-05-26 08:05:01 +02:00
default:
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
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
indent
2017-05-26 08:05:01 +02:00
break;
}
Initial commit
2015-04-16 16:58:33 +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_remote_events remote_events = {
PW_VERSION_REMOTE_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_changed = on_info_changed,
.state_changed = on_state_changed,
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
.sync_reply = on_sync_reply,
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);
core: add user_data to core
2019-01-08 17:30:12 +01:00
data.core = pw_core_new(l, NULL, 0);
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.core == NULL)
return -1;
man: update man pages Add man page for pipewire-cli
2017-09-19 10:19:53 +02:00
if (argc > 1)
props = pw_properties_new(PW_REMOTE_PROP_REMOTE_NAME, argv[1], NULL);
data.remote = pw_remote_new(data.core, props, 0);
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.remote == NULL)
return -1;
Initial commit
2015-04-16 16:58:33 +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
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
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 (pw_remote_connect(data.remote) < 0)
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
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.seq = 1;
spa_list_init(&data.pending_list);
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
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_remote_destroy(data.remote);
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_core_destroy(data.core);
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