mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "global: don't reuse ids"

Browse source 
This reverts commit bae0d16e09.
This commit is contained in:
Wim Taymans 2022-01-14 20:03:14 +01:00
parent 5135f9767a
commit b1fb4a2660
18 changed files with 77 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-session-manager/client-endpoint/endpoint-stream.c
View file

@ -304,6 +304,8 @@ int endpoint_stream_init(struct endpoint_stream *this,
pw_properties_setf(this->props, PW_KEY_OBJECT_ID, "%u",
pw_global_get_id(this->global));
pw_properties_setf(this->props, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));
this->info.version = PW_VERSION_ENDPOINT_STREAM_INFO;
this->info.id = pw_global_get_id(this->global);

3
src/modules/module-session-manager/client-endpoint/endpoint.c
View file

@ -305,6 +305,7 @@ int endpoint_init(struct endpoint *this,
struct pw_properties *properties)
{
static const char * const keys[] = {
PW_KEY_OBJECT_SERIAL,
PW_KEY_FACTORY_ID,
PW_KEY_CLIENT_ID,
PW_KEY_DEVICE_ID,
@ -333,6 +334,8 @@ int endpoint_init(struct endpoint *this,
pw_properties_setf(this->props, PW_KEY_OBJECT_ID, "%u",
pw_global_get_id(this->global));
pw_properties_setf(this->props, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));
this->info.version = PW_VERSION_ENDPOINT_INFO;
this->info.id = pw_global_get_id(this->global);

2
src/modules/module-session-manager/client-session/endpoint-link.c
View file

@ -322,6 +322,8 @@ int endpoint_link_init(struct endpoint_link *this,
pw_properties_setf(this->props, PW_KEY_OBJECT_ID, "%u",
pw_global_get_id(this->global));
pw_properties_setf(this->props, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));
this->info.version = PW_VERSION_ENDPOINT_LINK_INFO;
this->info.id = pw_global_get_id(this->global);

3
src/modules/module-session-manager/client-session/session.c
View file

@ -276,6 +276,7 @@ int session_init(struct session *this,
struct pw_properties *properties)
{
static const char * const keys[] = {
PW_KEY_OBJECT_SERIAL,
PW_KEY_FACTORY_ID,
PW_KEY_CLIENT_ID,
NULL
@ -295,6 +296,8 @@ int session_init(struct session *this,
pw_properties_setf(this->props, PW_KEY_OBJECT_ID, "%u",
pw_global_get_id(this->global));
pw_properties_setf(this->props, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));
this->info.version = PW_VERSION_SESSION_INFO;
this->info.id = pw_global_get_id(this->global);