diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2019-12-12 16:32:44 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2019-12-12 16:32:44 +0100 |
| commit | a1451fd8205b5602ed1a75753be9c3bd02f1a195 (patch) | |
| tree | 39844e289f1ff8f7bea09a95035337d3864d2a0b | |
| parent | 7a69c07afca2434873d362b56b4e1353c48db396 (diff) | |
keys: rename key for the module profile
| -rw-r--r-- | src/daemon/main.c | 6 | ||||
| -rw-r--r-- | src/pipewire/context.c | 2 | ||||
| -rw-r--r-- | src/pipewire/keys.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 40fec06c..c2a1a877 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) properties = pw_properties_new( PW_KEY_CORE_NAME, daemon_name, - PW_KEY_CORE_PROFILE_MODULES, "none", + PW_KEY_CONTEXT_PROFILE_MODULES, "none", PW_KEY_CORE_DAEMON, "1", NULL); /* parse configuration */ @@ -112,9 +112,7 @@ int main(int argc, char *argv[]) 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); - context = pw_context_new(pw_main_loop_get_loop(loop), - properties, 0); - + context = pw_context_new(pw_main_loop_get_loop(loop), properties, 0); if (context == NULL) { pw_log_error("failed to create context: %m"); return -1; diff --git a/src/pipewire/context.c b/src/pipewire/context.c index 2ecf493b..4722f651 100644 --- a/src/pipewire/context.c +++ b/src/pipewire/context.c @@ -618,7 +618,7 @@ struct pw_context *pw_context_new(struct pw_loop *main_loop, pw_global_add_listener(this->global, &this->global_listener, &global_events, this); pw_global_register(this->global); - if ((str = pw_properties_get(properties, PW_KEY_CORE_PROFILE_MODULES)) == NULL) + if ((str = pw_properties_get(properties, PW_KEY_CONTEXT_PROFILE_MODULES)) == NULL) str = "default"; load_module_profile(this, str); diff --git a/src/pipewire/keys.h b/src/pipewire/keys.h index b0e0bbab..570282b8 100644 --- a/src/pipewire/keys.h +++ b/src/pipewire/keys.h @@ -69,9 +69,12 @@ extern "C" { #define PW_KEY_OBJECT_PATH "object.path" /**< unique path to construct the object */ #define PW_KEY_OBJECT_ID "object.id" /**< a global object id */ +/* context */ +#define PW_KEY_CONTEXT_PROFILE_MODULES "context.profile.modules" /**< a context profile for modules */ + +/* core */ #define PW_KEY_CORE_ID "core.id" /**< the core id */ #define PW_KEY_CORE_MONITORS "core.monitors" /**< the apis monitored by core. */ -#define PW_KEY_CORE_PROFILE_MODULES "core.profile.modules" /**< a core profile for modules */ /* cpu */ #define PW_KEY_CPU_MAX_ALIGN "cpu.max-align" /**< maximum alignment needed to support |