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

19
src/daemon/main.c
View file

@ -55,6 +55,7 @@ int main(int argc, char *argv[])
struct pw_core *core;
struct pw_main_loop *loop;
struct pw_daemon_config *config;
struct pw_properties *properties;
char *err = NULL;
static const struct option long_options[] = {
{"help", 0, NULL, 'h'},
@ -88,8 +89,12 @@ int main(int argc, char *argv[])
}
}
properties = pw_properties_new(
PW_KEY_CORE_NAME, daemon_name,
PW_KEY_CORE_DAEMON, "1", NULL);
/* parse configuration */
config = pw_daemon_config_new();
config = pw_daemon_config_new(properties);
if (pw_daemon_config_load(config, &err) < 0) {
pw_log_error("failed to parse config: %s", err);
free(err);
@ -97,15 +102,17 @@ int main(int argc, char *argv[])
}
loop = pw_main_loop_new(NULL);
loop = pw_main_loop_new(pw_properties_copy(properties));
if (loop == NULL) {
pw_log_error("failed to create main-loop: %m");
return -1;
}
pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGINT, do_quit, loop);
pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGTERM, do_quit, loop);
core = pw_core_new(pw_main_loop_get_loop(loop),
pw_properties_new(
PW_KEY_CORE_NAME, daemon_name,
PW_KEY_CORE_DAEMON, "1", NULL),
0);
properties, 0);
if (core == NULL) {
pw_log_error("failed to create core: %m");