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

remote: make protocol configurable

Browse source
This commit is contained in:
Wim Taymans 2017-07-18 16:24:51 +02:00
parent 629f824b91
commit aff9564518
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pipewire/remote.c
View file

@ -154,6 +154,7 @@ struct pw_remote *pw_remote_new(struct pw_core *core,
struct remote *impl; struct remote *impl;
struct pw_remote *this; struct pw_remote *this;
struct pw_protocol *protocol; struct pw_protocol *protocol;
const char *protocol_name;
impl = calloc(1, sizeof(struct remote)); impl = calloc(1, sizeof(struct remote));
if (impl == NULL) if (impl == NULL)
@ -185,10 +186,14 @@ struct pw_remote *pw_remote_new(struct pw_core *core,
pw_signal_init(&this->state_changed); pw_signal_init(&this->state_changed);
pw_signal_init(&this->destroy_signal); pw_signal_init(&this->destroy_signal);
pw_module_load(core, "libpipewire-module-protocol-native", NULL, NULL); if ((protocol_name = pw_properties_get(properties, "pipewire.protocol")) == NULL) {
pw_module_load(core, "libpipewire-module-client-node", NULL, NULL); if (!pw_module_load(core, "libpipewire-module-protocol-native", NULL, NULL))
goto no_protocol;
protocol = pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native); protocol_name = PW_TYPE_PROTOCOL__Native;
}
protocol = pw_core_find_protocol(core, protocol_name);
if (protocol == NULL) if (protocol == NULL)
goto no_protocol; goto no_protocol;
@ -196,6 +201,8 @@ struct pw_remote *pw_remote_new(struct pw_core *core,
if (this->conn == NULL) if (this->conn == NULL)
goto no_connection; goto no_connection;
pw_module_load(core, "libpipewire-module-client-node", NULL, NULL);
spa_list_insert(core->remote_list.prev, &this->link); spa_list_insert(core->remote_list.prev, &this->link);
return this; return this;
@ -302,6 +309,5 @@ void pw_remote_disconnect(struct pw_remote *remote)
pw_core_info_free (remote->info); pw_core_info_free (remote->info);
remote->info = NULL; remote->info = NULL;
} }
pw_remote_update_state(remote, PW_REMOTE_STATE_UNCONNECTED, NULL); pw_remote_update_state(remote, PW_REMOTE_STATE_UNCONNECTED, NULL);
} }