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

keys: let env variables overwrite the keys

Browse source
This commit is contained in:
Wim Taymans 2020-07-22 11:25:19 +02:00
parent 2955182e4e
commit 2bb1d88fbe
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/module-protocol-native.c
View file

@ -980,12 +980,11 @@ static const struct spa_loop_control_hooks impl_hooks = {
static const char * static const char *
get_name(const struct spa_dict *props) get_name(const struct spa_dict *props)
{ {
const char *name = NULL; const char *name;
if (props)
name = spa_dict_lookup(props, PW_KEY_CORE_NAME);
if (name == NULL)
name = getenv("PIPEWIRE_CORE"); name = getenv("PIPEWIRE_CORE");
if (props && name == NULL)
name = spa_dict_lookup(props, PW_KEY_CORE_NAME);
if (name == NULL) if (name == NULL)
name = "pipewire-0"; name = "pipewire-0";
return name; return name;

7
src/modules/module-protocol-native/local-socket.c
View file

@ -39,12 +39,11 @@
static const char * static const char *
get_remote(const struct spa_dict *props) get_remote(const struct spa_dict *props)
{ {
const char *name = NULL; const char *name;
if (props)
name = spa_dict_lookup(props, PW_KEY_REMOTE_NAME);
if (name == NULL)
name = getenv("PIPEWIRE_REMOTE"); name = getenv("PIPEWIRE_REMOTE");
if (props && name == NULL)
name = spa_dict_lookup(props, PW_KEY_REMOTE_NAME);
if (name == NULL) if (name == NULL)
name = "pipewire-0"; name = "pipewire-0";
return name; return name;

6
src/pipewire/keys.h
View file

@ -64,7 +64,8 @@ extern "C" {
/* core */ /* core */
#define PW_KEY_CORE_NAME "core.name" /**< The name of the core. Default is #define PW_KEY_CORE_NAME "core.name" /**< The name of the core. Default is
* pipewire-<user-name>-<pid> */ * pipewire-<user-name>-<pid>, overwritten
* by env(PIPEWIRE_CORE) */
#define PW_KEY_CORE_VERSION "core.version" /**< The version of the core. */ #define PW_KEY_CORE_VERSION "core.version" /**< The version of the core. */
#define PW_KEY_CORE_DAEMON "core.daemon" /**< If the core is listening for connections. */ #define PW_KEY_CORE_DAEMON "core.daemon" /**< If the core is listening for connections. */
@ -82,7 +83,8 @@ extern "C" {
/* remote keys */ /* remote keys */
#define PW_KEY_REMOTE_NAME "remote.name" /**< The name of the remote to connect to, #define PW_KEY_REMOTE_NAME "remote.name" /**< The name of the remote to connect to,
* default env(PIPEWIRE_REMOTE) or pipewire-0 */ * default pipewire-0, overwritten by
* env(PIPEWIRE_REMOTE) */
#define PW_KEY_REMOTE_INTENTION "remote.intention" /**< The intention of the remote connection, #define PW_KEY_REMOTE_INTENTION "remote.intention" /**< The intention of the remote connection,
* "generic", "screencast" */ * "generic", "screencast" */