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: only use properties on core

Browse source
This commit is contained in:
Wim Taymans 2019-06-06 15:05:37 +02:00
parent f5192d533f
commit 92d7da0103
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/daemon/main.c
View file

@ -56,7 +56,6 @@ int main(int argc, char *argv[])
struct pw_main_loop *loop; struct pw_main_loop *loop;
struct pw_daemon_config *config; struct pw_daemon_config *config;
char *err = NULL; char *err = NULL;
struct pw_properties *props;
static const struct option long_options[] = { static const struct option long_options[] = {
{"help", 0, NULL, 'h'}, {"help", 0, NULL, 'h'},
{"version", 0, NULL, 'v'}, {"version", 0, NULL, 'v'},
@ -97,14 +96,16 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
props = pw_properties_new(PW_KEY_CORE_NAME, daemon_name,
PW_KEY_CORE_DAEMON, "1", NULL);
loop = pw_main_loop_new(props); loop = pw_main_loop_new(NULL);
pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGINT, do_quit, loop); 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); pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGTERM, do_quit, loop);
core = pw_core_new(pw_main_loop_get_loop(loop), props, 0); 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);
if (pw_daemon_config_run_commands(config, core) < 0) { if (pw_daemon_config_run_commands(config, core) < 0) {
pw_log_error("failed to run config commands"); pw_log_error("failed to run config commands");