small cleanups

This commit is contained in:
Wim Taymans 2020-03-03 10:24:18 +01:00
parent 3d9f54d8a4
commit ce275e5917
3 changed files with 13 additions and 13 deletions

View file

@ -221,7 +221,7 @@ handle_node(struct impl *impl, struct sm_object *object)
node->direction = direction;
node->type = NODE_TYPE_STREAM;
node->media = strdup(media_class);
pw_log_debug(NAME "%p: node %d is stream %s", impl, object->id, node->media);
pw_log_debug(NAME" %p: node %d is stream %s", impl, object->id, node->media);
}
else {
const char *media;

View file

@ -936,12 +936,12 @@ filter_new(struct pw_context *context, const char *name,
}
if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
if ((str = pw_properties_get(extra, PW_KEY_APP_NAME)) != NULL)
pw_properties_set(props, PW_KEY_NODE_NAME, str);
else if ((str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY)) != NULL)
pw_properties_set(props, PW_KEY_NODE_NAME, str);
else
pw_properties_set(props, PW_KEY_NODE_NAME, name);
str = pw_properties_get(extra, PW_KEY_APP_NAME);
if (str == NULL)
str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
if (str == NULL)
str = name;
pw_properties_set(props, PW_KEY_NODE_NAME, name);
}
spa_hook_list_init(&impl->hooks);

View file

@ -1076,12 +1076,12 @@ stream_new(struct pw_context *context, const char *name,
pw_properties_set(props, PW_KEY_STREAM_IS_LIVE, "1");
if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
if ((str = pw_properties_get(extra, PW_KEY_APP_NAME)) != NULL)
pw_properties_set(props, PW_KEY_NODE_NAME, str);
else if ((str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY)) != NULL)
pw_properties_set(props, PW_KEY_NODE_NAME, str);
else
pw_properties_set(props, PW_KEY_NODE_NAME, name);
str = pw_properties_get(extra, PW_KEY_APP_NAME);
if (str == NULL)
str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
if (str == NULL)
str = name;
pw_properties_set(props, PW_KEY_NODE_NAME, name);
}
spa_hook_list_init(&impl->hooks);