mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: add support for properties in the config file

Browse source 
Make a set-prop command to set a property from the config file
into a pw_properties. Pass this to the pw_core_new() and the
main-loop to tweak some stuff.

Move some warns to errors
This commit is contained in:
Wim Taymans 2019-06-20 15:19:28 +02:00
parent 85caf0b485
commit 03eeb945f3
11 changed files with 122 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/daemon/command.c
View file

@ -37,16 +37,17 @@
/** \cond */
static struct pw_command *parse_command_help(const char *line, char **err);
static struct pw_command *parse_command_add_spa_lib(const char *line, char **err);
static struct pw_command *parse_command_module_load(const char *line, char **err);
static struct pw_command *parse_command_exec(const char *line, char **err);
static struct pw_command *parse_command_help(struct pw_properties *properties, const char *line, char **err);
static struct pw_command *parse_command_set_prop(struct pw_properties *properties, const char *line, char **err);
static struct pw_command *parse_command_add_spa_lib(struct pw_properties *properties, const char *line, char **err);
static struct pw_command *parse_command_module_load(struct pw_properties *properties, const char *line, char **err);
static struct pw_command *parse_command_exec(struct pw_properties *properties, const char *line, char **err);
struct impl {
struct pw_command this;
};
typedef struct pw_command *(*pw_command_parse_func_t) (const char *line, char **err);
typedef struct pw_command *(*pw_command_parse_func_t) (struct pw_properties *properties, const char *line, char **err);
struct command_parse {
const char *name;
@ -56,6 +57,7 @@ struct command_parse {
static const struct command_parse parsers[] = {
{"help", "Show this help", parse_command_help},
{"set-prop", "Set a property", parse_command_set_prop},
{"add-spa-lib", "Add a library that provides a spa factory name regex", parse_command_add_spa_lib},
{"load-module", "Load a module", parse_command_module_load},
{"exec", "Execute a program", parse_command_exec},
@ -77,7 +79,7 @@ execute_command_help(struct pw_command *command, struct pw_core *core, char **er
return 0;
}
static struct pw_command *parse_command_help(const char *line, char **err)
static struct pw_command *parse_command_help(struct pw_properties *properties, const char *line, char **err)
{
struct impl *impl;
struct pw_command *this;
@ -97,6 +99,42 @@ no_mem:
return NULL;
}
static int
execute_command_set_prop(struct pw_command *command, struct pw_core *core, char **err)
{
return 0;
}
static struct pw_command *parse_command_set_prop(struct pw_properties *properties, const char *line, char **err)
{
struct impl *impl;
struct pw_command *this;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
goto error_alloc;
this = &impl->this;
this->func = execute_command_set_prop;
this->args = pw_split_strv(line, whitespace, 4, &this->n_args);
if (this->n_args < 3)
goto error_arguments;
pw_log_debug("set property: '%s' = '%s'", this->args[1], this->args[2]);
pw_properties_set(properties, this->args[1], this->args[2]);
return this;
error_arguments:
asprintf(err, "%s requires <property-name> <value>", this->args[0]);
pw_free_strv(this->args);
return NULL;
error_alloc:
asprintf(err, "alloc failed: %m");
return NULL;
}
static int
execute_command_add_spa_lib(struct pw_command *command, struct pw_core *core, char **err)
{
@ -110,7 +148,7 @@ execute_command_add_spa_lib(struct pw_command *command, struct pw_core *core, ch
return 0;
}
static struct pw_command *parse_command_add_spa_lib(const char *line, char **err)
static struct pw_command *parse_command_add_spa_lib(struct pw_properties *properties, const char *line, char **err)
{
struct impl *impl;
struct pw_command *this;
@ -150,7 +188,7 @@ execute_command_module_load(struct pw_command *command, struct pw_core *core, ch
return 0;
}
static struct pw_command *parse_command_module_load(const char *line, char **err)
static struct pw_command *parse_command_module_load(struct pw_properties *properties, const char *line, char **err)
{
struct impl *impl;
struct pw_command *this;
@ -194,7 +232,7 @@ execute_command_exec(struct pw_command *command, struct pw_core *core, char **er
return 0;
}
static struct pw_command *parse_command_exec(const char *line, char **err)
static struct pw_command *parse_command_exec(struct pw_properties *properties, const char *line, char **err)
{
struct impl *impl;
struct pw_command *this;
@ -250,7 +288,7 @@ void pw_command_free(struct pw_command *command)
* \memberof pw_command
*/
SPA_EXPORT
struct pw_command *pw_command_parse(const char *line, char **err)
struct pw_command *pw_command_parse(struct pw_properties *properties, const char *line, char **err)
{
struct pw_command *command = NULL;
const struct command_parse *parse;
@ -263,7 +301,7 @@ struct pw_command *pw_command_parse(const char *line, char **err)
for (parse = parsers; parse->name != NULL; parse++) {
if (strcmp(name, parse->name) == 0) {
command = parse->func(line, err);
command = parse->func(properties, line, err);
goto out;
}
}