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

module-rtp: listen to all available session types

Browse source
This commit is contained in:
Wim Taymans 2023-03-01 15:21:57 +01:00
parent 4ee9696548
commit 4937da471f
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/module-rtp-session.c
View file

@ -1101,7 +1101,16 @@ static struct service *make_service(struct impl *impl, const struct service_info
s->info.protocol == AVAHI_PROTO_INET ? 4 : 6); s->info.protocol == AVAHI_PROTO_INET ? 4 : 6);
pw_properties_setf(props, "destination.ip", "%s", at); pw_properties_setf(props, "destination.ip", "%s", at);
pw_properties_setf(props, "destination.port", "%u", s->info.port); pw_properties_setf(props, "destination.port", "%u", s->info.port);
pw_properties_set(props, "rtp.media", "midi");
if (spa_streq(s->info.type, "_apple-midi._udp"))
pw_properties_set(props, "rtp.media", "midi");
else if (spa_streq(s->info.type, "_pipewire-audio._udp"))
pw_properties_set(props, "rtp.media", "audio");
else {
pw_log_error("unknown type %s", s->info.type);
res = -EINVAL;
goto error;
}
if ((str = strstr(s->info.name, "@"))) { if ((str = strstr(s->info.name, "@"))) {
str++; str++;
@ -1117,7 +1126,7 @@ static struct service *make_service(struct impl *impl, const struct service_info
if (sess == NULL) { if (sess == NULL) {
res = -errno; res = -errno;
pw_log_error("can't create session: %m"); pw_log_error("can't create session: %m");
return s; goto error;
} }
s->sess = sess; s->sess = sess;
@ -1239,13 +1248,15 @@ static int make_browser(struct impl *impl)
{ {
const char *service_name; const char *service_name;
if ((service_name = get_service_name(impl)) == NULL)
return -ENOTSUP;
if (impl->browser == NULL) { if (impl->browser == NULL) {
impl->browser = avahi_service_browser_new(impl->client, impl->browser = avahi_service_browser_new(impl->client,
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
service_name, NULL, 0, "_apple-midi._udp", NULL, 0,
browser_cb, impl);
avahi_service_browser_new(impl->client,
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
"_pipewire-audio._udp", NULL, 0,
browser_cb, impl); browser_cb, impl);
} }
if (impl->browser == NULL) { if (impl->browser == NULL) {