mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: add keys for properties

Browse source 
Define and document property keys
This commit is contained in:
Wim Taymans 2019-06-03 16:48:01 +02:00
parent 1f250046a3
commit 49ef8f9b5f
35 changed files with 333 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/examples/export-spa-device.c
View file

@ -54,8 +54,8 @@ static int make_device(struct data *data)
if (factory == NULL)
return -1;
props = pw_properties_new("spa.library.name", data->library,
"spa.factory.name", data->factory, NULL);
props = pw_properties_new(SPA_KEY_LIBRARY_NAME, data->library,
SPA_KEY_FACTORY_NAME, data->factory, NULL);
data->device = pw_factory_create_object(factory,
NULL,

4
src/examples/export-spa.c
View file

@ -54,8 +54,8 @@ static int make_node(struct data *data)
if (factory == NULL)
return -1;
props = pw_properties_new("spa.library.name", data->library,
"spa.factory.name", data->factory, NULL);
props = pw_properties_new(SPA_KEY_LIBRARY_NAME, data->library,
SPA_KEY_FACTORY_NAME, data->factory, NULL);
if (data->path) {
pw_properties_set(props, PW_KEY_NODE_AUTOCONNECT, "1");

4
src/examples/local-v4l2.c
View file

@ -347,8 +347,8 @@ static int make_nodes(struct data *data)
pw_node_register(data->node, NULL, NULL, NULL);
factory = pw_core_find_factory(data->core, "spa-node-factory");
props = pw_properties_new("spa.library.name", "v4l2/libspa-v4l2",
"spa.factory.name", "api.v4l2.source", NULL);
props = pw_properties_new(SPA_KEY_LIBRARY_NAME, "v4l2/libspa-v4l2",
SPA_KEY_FACTORY_NAME, "api.v4l2.source", NULL);
data->v4l2 = pw_factory_create_object(factory,
NULL,
PW_TYPE_INTERFACE_Node,

2
src/modules/module-audio-dsp/audio-dsp.c
View file

@ -316,7 +316,7 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
}
pw_properties_set(pr, "factory.mode", factory);
factory = "audioconvert";
pw_properties_set(pr, "spa.library.name", "audioconvert/libspa-audioconvert");
pw_properties_set(pr, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
node = pw_spa_node_load(core, NULL, NULL,
factory,

6
src/modules/spa/module-device-factory.c
View file

@ -33,8 +33,8 @@
#include "spa-device.h"
#define FACTORY_USAGE "spa.factory.name=<factory-name> " \
"[spa.library.name=<library-name>]"
#define FACTORY_USAGE SPA_KEY_FACTORY_NAME"=<factory-name> " \
"["SPA_KEY_LIBRARY_NAME"=<library-name>]"
static const struct spa_dict_item module_props[] = {
{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
@ -87,7 +87,7 @@ static void *create_object(void *_data,
if (properties == NULL)
goto no_properties;
factory_name = pw_properties_get(properties, "spa.factory.name");
factory_name = pw_properties_get(properties, SPA_KEY_FACTORY_NAME);
if (factory_name == NULL)
goto no_properties;

6
src/modules/spa/module-node-factory.c
View file

@ -33,8 +33,8 @@
#include "spa-node.h"
#define FACTORY_USAGE "spa.factory.name=<factory-name> " \
"[spa.library.name=<library-name>]"
#define FACTORY_USAGE SPA_KEY_FACTORY_NAME"=<factory-name> " \
"["SPA_KEY_LIBRARY_NAME"=<library-name>]"
static const struct spa_dict_item module_props[] = {
{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
@ -87,7 +87,7 @@ static void *create_object(void *_data,
if (properties == NULL)
goto no_properties;
factory_name = pw_properties_get(properties, "spa.factory.name");
factory_name = pw_properties_get(properties, SPA_KEY_FACTORY_NAME);
if (factory_name == NULL)
goto no_properties;

2
src/modules/spa/spa-device.c
View file

@ -142,7 +142,7 @@ struct pw_device *pw_spa_device_load(struct pw_core *core,
support = pw_core_get_support(core, &n_support);
if (lib == NULL && properties)
lib = pw_properties_get(properties, "spa.library.name");
lib = pw_properties_get(properties, SPA_KEY_LIBRARY_NAME);
if (lib == NULL)
lib = pw_core_find_spa_lib(core, factory_name);
if (lib == NULL)

2
src/modules/spa/spa-monitor.c
View file

@ -279,7 +279,7 @@ struct pw_spa_monitor *pw_spa_monitor_load(struct pw_core *core,
uint32_t n_support;
if (lib == NULL && properties)
lib = pw_properties_get(properties, "spa.library.name");
lib = pw_properties_get(properties, SPA_KEY_LIBRARY_NAME);
if (lib == NULL)
lib = pw_core_find_spa_lib(core, factory_name);
if (lib == NULL)

2
src/modules/spa/spa-node.c
View file

@ -257,7 +257,7 @@ struct pw_node *pw_spa_node_load(struct pw_core *core,
uint32_t n_support;
if (lib == NULL && properties)
lib = pw_properties_get(properties, "spa.library.name");
lib = pw_properties_get(properties, SPA_KEY_LIBRARY_NAME);
if (lib == NULL)
lib = pw_core_find_spa_lib(core, factory_name);
if (lib == NULL)

1
src/pipewire/keys.h
View file

@ -162,6 +162,7 @@ extern "C" {
#define PW_KEY_DEVICE_BUS "device.bus" /**< bus of the device if applicable. One of
* "isa", "pci", "usb", "firewire",
* "bluetooth" */
#define PW_KEY_DEVICE_SUBSYSTEM "device.subsystem" /**< device subsystem */
#define PW_KEY_DEVICE_ICON "device.icon" /**< icon for the device. A base64 blob
* containing PNG image data */
#define PW_KEY_DEVICE_ICON_NAME "device.icon-name" /**< an XDG icon name for the device.

2
src/pipewire/pipewire.c
View file

@ -364,7 +364,7 @@ void pw_init(int *argc, char **argv[])
support->support_plugin = plugin;
items[0] = SPA_DICT_ITEM_INIT("log.colors", "1");
items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_COLORS, "1");
info = SPA_DICT_INIT(items, 1);
handle = load_handle(plugin, "logger", &info, support->n_support, support->support);