colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules: add 'monitor' context when getting ports in adapter and simple-node-endpoint

Browse Source
This commit is contained in:
Julian Bouzas
2020-05-19 11:17:52 -04:00
parent d5f167b7db
commit ee4e40ba1e
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/module-si-adapter.c
View File

@@ -8,6 +8,7 @@
#include <wp/wp.h> #include <wp/wp.h>
#include <pipewire/keys.h> #include <pipewire/keys.h>
#include <pipewire/properties.h>
#include <pipewire/extensions/session-manager/keys.h> #include <pipewire/extensions/session-manager/keys.h>
#include <spa/param/format.h> #include <spa/param/format.h>
@@ -478,13 +479,18 @@ si_adapter_get_ports (WpSiPortInfo * item, const gchar * context)
g_autoptr (WpIterator) it = NULL; g_autoptr (WpIterator) it = NULL;
g_auto (GValue) val = G_VALUE_INIT; g_auto (GValue) val = G_VALUE_INIT;
WpDirection direction = self->direction; WpDirection direction = self->direction;
gboolean monitor_context = FALSE;
guint32 node_id; guint32 node_id;
/* context can only be either NULL or "reverse" */ /* context can only be NULL, "reverse" or "monitor" */
if (!g_strcmp0 (context, "reverse")) { if (!g_strcmp0 (context, "reverse")) {
direction = (self->direction == WP_DIRECTION_INPUT) ? direction = (self->direction == WP_DIRECTION_INPUT) ?
WP_DIRECTION_OUTPUT : WP_DIRECTION_INPUT; WP_DIRECTION_OUTPUT : WP_DIRECTION_INPUT;
} }
else if (!g_strcmp0 (context, "monitor")) {
direction = WP_DIRECTION_OUTPUT;
monitor_context = TRUE;
}
else if (context != NULL) { else if (context != NULL) {
/* on any other context, return an empty list of ports */ /* on any other context, return an empty list of ports */
return g_variant_new_array (G_VARIANT_TYPE ("(uuu)"), NULL, 0); return g_variant_new_array (G_VARIANT_TYPE ("(uuu)"), NULL, 0);
@@ -499,17 +505,26 @@ si_adapter_get_ports (WpSiPortInfo * item, const gchar * context)
{ {
WpPort *port = g_value_get_object (&val); WpPort *port = g_value_get_object (&val);
g_autoptr (WpProperties) props = NULL; g_autoptr (WpProperties) props = NULL;
const gchar *str;
const gchar *channel; const gchar *channel;
guint32 port_id, channel_id = 0; guint32 port_id, channel_id = 0;
gboolean is_monitor = FALSE;
if (wp_port_get_direction (port) != direction) if (wp_port_get_direction (port) != direction)
continue; continue;
/* skip monitor ports if not monitor context, or skip non-monitor ports if
* monitor context */
props = wp_proxy_get_properties (WP_PROXY (port));
str = wp_properties_get (props, PW_KEY_PORT_MONITOR);
is_monitor = str && pw_properties_parse_bool (str);
if (is_monitor != monitor_context)
continue;
port_id = wp_proxy_get_bound_id (WP_PROXY (port)); port_id = wp_proxy_get_bound_id (WP_PROXY (port));
/* try to find the audio channel; if channel is NULL, this will silently /* try to find the audio channel; if channel is NULL, this will silently
leave the channel_id to its default value, 0 */ leave the channel_id to its default value, 0 */
props = wp_proxy_get_properties (WP_PROXY (port));
channel = wp_properties_get (props, PW_KEY_AUDIO_CHANNEL); channel = wp_properties_get (props, PW_KEY_AUDIO_CHANNEL);
wp_spa_type_get_by_nick (WP_SPA_TYPE_TABLE_AUDIO_CHANNEL, channel, wp_spa_type_get_by_nick (WP_SPA_TYPE_TABLE_AUDIO_CHANNEL, channel,
&channel_id, NULL, NULL); &channel_id, NULL, NULL);

19
modules/module-si-simple-node-endpoint.c
View File

@@ -8,6 +8,7 @@
#include <wp/wp.h> #include <wp/wp.h>
#include <pipewire/keys.h> #include <pipewire/keys.h>
#include <pipewire/properties.h>
#include <pipewire/extensions/session-manager/keys.h> #include <pipewire/extensions/session-manager/keys.h>
enum { enum {
@@ -343,13 +344,18 @@ si_simple_node_endpoint_get_ports (WpSiPortInfo * item, const gchar * context)
g_autoptr (WpIterator) it = NULL; g_autoptr (WpIterator) it = NULL;
g_auto (GValue) val = G_VALUE_INIT; g_auto (GValue) val = G_VALUE_INIT;
WpDirection direction = self->direction; WpDirection direction = self->direction;
gboolean monitor_context = FALSE;
guint32 node_id; guint32 node_id;
/* context can only be either NULL or "reverse" */ /* context can only be NULL, "reverse" or "monitor" */
if (!g_strcmp0 (context, "reverse")) { if (!g_strcmp0 (context, "reverse")) {
direction = (self->direction == WP_DIRECTION_INPUT) ? direction = (self->direction == WP_DIRECTION_INPUT) ?
WP_DIRECTION_OUTPUT : WP_DIRECTION_INPUT; WP_DIRECTION_OUTPUT : WP_DIRECTION_INPUT;
} }
else if (!g_strcmp0 (context, "monitor")) {
direction = WP_DIRECTION_OUTPUT;
monitor_context = TRUE;
}
else if (context != NULL) { else if (context != NULL) {
/* on any other context, return an empty list of ports */ /* on any other context, return an empty list of ports */
return g_variant_new_array (G_VARIANT_TYPE ("(uuu)"), NULL, 0); return g_variant_new_array (G_VARIANT_TYPE ("(uuu)"), NULL, 0);
@@ -364,17 +370,26 @@ si_simple_node_endpoint_get_ports (WpSiPortInfo * item, const gchar * context)
{ {
WpPort *port = g_value_get_object (&val); WpPort *port = g_value_get_object (&val);
g_autoptr (WpProperties) props = NULL; g_autoptr (WpProperties) props = NULL;
const gchar *str;
const gchar *channel; const gchar *channel;
guint32 port_id, channel_id = 0; guint32 port_id, channel_id = 0;
gboolean is_monitor = FALSE;
if (wp_port_get_direction (port) != direction) if (wp_port_get_direction (port) != direction)
continue; continue;
/* skip monitor ports if not monitor context, or skip non-monitor ports if
* monitor context */
props = wp_proxy_get_properties (WP_PROXY (port));
str = wp_properties_get (props, PW_KEY_PORT_MONITOR);
is_monitor = str && pw_properties_parse_bool (str);
if (is_monitor != monitor_context)
continue;
port_id = wp_proxy_get_bound_id (WP_PROXY (port)); port_id = wp_proxy_get_bound_id (WP_PROXY (port));
/* try to find the audio channel; if channel is NULL, this will silently /* try to find the audio channel; if channel is NULL, this will silently
leave the channel_id to its default value, 0 */ leave the channel_id to its default value, 0 */
props = wp_proxy_get_properties (WP_PROXY (port));
channel = wp_properties_get (props, PW_KEY_AUDIO_CHANNEL); channel = wp_properties_get (props, PW_KEY_AUDIO_CHANNEL);
wp_spa_type_get_by_nick (WP_SPA_TYPE_TABLE_AUDIO_CHANNEL, channel, wp_spa_type_get_by_nick (WP_SPA_TYPE_TABLE_AUDIO_CHANNEL, channel,
&channel_id, NULL, NULL); &channel_id, NULL, NULL);