mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-22 06:59:59 -05:00
Work on node creation
Implements the basics of the PORT_UPDATE control message Add the ports to the proxy node with whe PORT_UPDATE control message. Let the proxy node check the events and create dbus objects based on added/removed ports.
This commit is contained in:
Wim Taymans
parent
ac5d22ec79
commit
de53315f6e
17 changed files with 350 additions and 215 deletions
|
|
@ -74,6 +74,7 @@ struct _PinosStreamPrivate
|
|||
|
||||
GPtrArray *possible_formats;
|
||||
SpaFormat *format;
|
||||
SpaPortInfo port_info;
|
||||
|
||||
PinosStreamFlags flags;
|
||||
|
||||
|
|
@ -512,17 +513,28 @@ pinos_stream_get_error (PinosStream *stream)
|
|||
return stream->priv->error;
|
||||
}
|
||||
|
||||
static void
|
||||
control_builder_init (PinosStream *stream, SpaControlBuilder *builder)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
|
||||
spa_control_builder_init_into (builder,
|
||||
priv->send_data,
|
||||
MAX_BUFFER_SIZE,
|
||||
priv->send_fds,
|
||||
MAX_FDS);
|
||||
}
|
||||
|
||||
static void
|
||||
send_need_input (PinosStream *stream, uint32_t port_id, uint32_t buffer_id)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
SpaControlBuilder builder;
|
||||
SpaControl control;
|
||||
guint8 buffer[64];
|
||||
SpaControlCmdNeedInput ni;
|
||||
SpaControlCmdReuseBuffer rb;
|
||||
|
||||
spa_control_builder_init_into (&builder, buffer, 64, NULL, 0);
|
||||
control_builder_init (stream, &builder);
|
||||
if (buffer_id != SPA_ID_INVALID) {
|
||||
rb.port_id = port_id;
|
||||
rb.buffer_id = buffer_id;
|
||||
|
|
@ -586,7 +598,6 @@ parse_control (PinosStream *stream,
|
|||
SpaControlBuilder builder;
|
||||
SpaControl control;
|
||||
SpaControlCmdStateChange sc;
|
||||
guint8 buffer[64];
|
||||
|
||||
if (spa_control_iter_parse_cmd (&it, &p) < 0)
|
||||
break;
|
||||
|
|
@ -598,10 +609,11 @@ parse_control (PinosStream *stream,
|
|||
spa_debug_format (p.format);
|
||||
g_object_notify (G_OBJECT (stream), "format");
|
||||
|
||||
control_builder_init (stream, &builder);
|
||||
|
||||
/* FIXME send update port status */
|
||||
|
||||
/* send state-change */
|
||||
spa_control_builder_init_into (&builder, buffer, sizeof(buffer), NULL, 0);
|
||||
sc.state = SPA_NODE_STATE_READY;
|
||||
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_STATE_CHANGE, &sc);
|
||||
spa_control_builder_end (&builder, &control);
|
||||
|
|
@ -852,6 +864,44 @@ unhandle_socket (PinosStream *stream)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
do_node_init (PinosStream *stream)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
SpaControlCmdNodeUpdate nu;
|
||||
SpaControlCmdPortUpdate pu;
|
||||
SpaControlBuilder builder;
|
||||
SpaControl control;
|
||||
|
||||
control_builder_init (stream, &builder);
|
||||
nu.change_mask = SPA_CONTROL_CMD_NODE_UPDATE_MAX_INPUTS |
|
||||
SPA_CONTROL_CMD_NODE_UPDATE_MAX_OUTPUTS;
|
||||
nu.max_input_ports = 1;
|
||||
nu.max_output_ports = 0;
|
||||
nu.props = NULL;
|
||||
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_NODE_UPDATE, &nu);
|
||||
|
||||
pu.port_id = 0;
|
||||
pu.change_mask = SPA_CONTROL_CMD_PORT_UPDATE_DIRECTION |
|
||||
SPA_CONTROL_CMD_PORT_UPDATE_POSSIBLE_FORMATS |
|
||||
SPA_CONTROL_CMD_PORT_UPDATE_INFO;
|
||||
|
||||
pu.direction = priv->direction;
|
||||
pu.n_possible_formats = priv->possible_formats->len;
|
||||
pu.possible_formats = (const SpaFormat **)priv->possible_formats->pdata;
|
||||
pu.props = NULL;
|
||||
pu.info = &priv->port_info;
|
||||
priv->port_info.flags = SPA_PORT_INFO_FLAG_NONE |
|
||||
SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
|
||||
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_PORT_UPDATE, &pu);
|
||||
spa_control_builder_end (&builder, &control);
|
||||
|
||||
if (spa_control_write (&control, priv->fd) < 0)
|
||||
g_warning ("stream %p: error writing control", stream);
|
||||
|
||||
spa_control_clear (&control);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
on_node_proxy (GObject *source_object,
|
||||
|
|
@ -869,6 +919,8 @@ on_node_proxy (GObject *source_object,
|
|||
if (priv->node == NULL)
|
||||
goto node_failed;
|
||||
|
||||
do_node_init (stream);
|
||||
|
||||
stream_set_state (stream, PINOS_STREAM_STATE_READY, NULL);
|
||||
g_object_unref (stream);
|
||||
|
||||
|
|
@ -951,25 +1003,12 @@ do_connect (PinosStream *stream)
|
|||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
PinosContext *context = priv->context;
|
||||
GVariantBuilder b;
|
||||
GVariant *ports;
|
||||
|
||||
g_variant_builder_init (&b, G_VARIANT_TYPE ("a(uusa{sv}s)"));
|
||||
g_variant_builder_open (&b, G_VARIANT_TYPE ("(uusa{sv}s)"));
|
||||
g_variant_builder_add (&b, "u", priv->direction);
|
||||
g_variant_builder_add (&b, "u", 0);
|
||||
g_variant_builder_add (&b, "s", "");
|
||||
g_variant_builder_add_value (&b, pinos_properties_to_variant (priv->properties));
|
||||
g_variant_builder_add (&b, "s", priv->path == NULL ? "" : priv->path);
|
||||
g_variant_builder_close (&b);
|
||||
ports = g_variant_builder_end (&b);
|
||||
|
||||
g_dbus_proxy_call (context->priv->daemon,
|
||||
"CreateClientNode",
|
||||
g_variant_new ("(s@a{sv}@a(uusa{sv}s))",
|
||||
g_variant_new ("(s@a{sv})",
|
||||
"client-node",
|
||||
pinos_properties_to_variant (priv->properties),
|
||||
ports),
|
||||
pinos_properties_to_variant (priv->properties)),
|
||||
G_DBUS_CALL_FLAGS_NONE,
|
||||
-1,
|
||||
NULL, /* GCancellable *cancellable */
|
||||
|
|
@ -1025,34 +1064,17 @@ pinos_stream_connect (PinosStream *stream,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
control_builder_init (PinosStream *stream, SpaControlBuilder *builder)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
|
||||
spa_control_builder_init_into (builder,
|
||||
priv->send_data,
|
||||
MAX_BUFFER_SIZE,
|
||||
priv->send_fds,
|
||||
MAX_FDS);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
do_start (PinosStream *stream)
|
||||
{
|
||||
PinosStreamPrivate *priv = stream->priv;
|
||||
SpaControlBuilder builder;
|
||||
SpaControlCmdPortUpdate pu;
|
||||
SpaControlCmdStateChange sc;
|
||||
SpaControl control;
|
||||
|
||||
handle_socket (stream, priv->fd);
|
||||
|
||||
control_builder_init (stream, &builder);
|
||||
pu.port_id = 0;
|
||||
pu.change_mask = 0;
|
||||
|
||||
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_PORT_UPDATE, &pu);
|
||||
sc.state = SPA_NODE_STATE_CONFIGURE;
|
||||
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_STATE_CHANGE, &sc);
|
||||
spa_control_builder_end (&builder, &control);
|
||||
|
|
@ -1060,6 +1082,8 @@ do_start (PinosStream *stream)
|
|||
if (spa_control_write (&control, priv->fd) < 0)
|
||||
g_warning ("stream %p: failed to write control", stream);
|
||||
|
||||
spa_control_clear (&control);
|
||||
|
||||
g_object_unref (stream);
|
||||
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -41,15 +41,13 @@
|
|||
<!-- CreateClientNode:
|
||||
@name: the name of the node
|
||||
@Properties: extra properties
|
||||
@ports: the port descriptions
|
||||
@node: the Node1 object path
|
||||
|
||||
Create a new Node with given name and properties and ports.
|
||||
Create a new Node
|
||||
-->
|
||||
<method name='CreateClientNode'>
|
||||
<arg type='s' name='name' direction='in' />
|
||||
<arg type='a{sv}' name='properties' direction='in'/>
|
||||
<arg type='a(uusa{sv}s)' name='ports' direction='in'/>
|
||||
<arg type='o' name='node' direction='out'/>
|
||||
<arg type='h' name='fd' direction='out'/>
|
||||
</method>
|
||||
|
|
|
|||
|
|
@ -38,14 +38,6 @@
|
|||
#define PINOS_SPA_V4L2_SOURCE_GET_PRIVATE(obj) \
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_SPA_V4L2_SOURCE, PinosSpaV4l2SourcePrivate))
|
||||
|
||||
typedef struct {
|
||||
PinosSpaV4l2Source *source;
|
||||
|
||||
guint id;
|
||||
gboolean have_format;
|
||||
PinosPort *port;
|
||||
} SourcePortData;
|
||||
|
||||
struct _PinosSpaV4l2SourcePrivate
|
||||
{
|
||||
SpaPollFd fds[16];
|
||||
|
|
@ -56,8 +48,6 @@ struct _PinosSpaV4l2SourcePrivate
|
|||
pthread_t thread;
|
||||
|
||||
GBytes *format;
|
||||
|
||||
GList *ports;
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
@ -158,11 +148,12 @@ on_source_event (SpaNode *node, SpaEvent *event, void *user_data)
|
|||
if ((res = spa_node_port_pull_output (node, 1, info)) < 0)
|
||||
g_debug ("spa-v4l2-source %p: got pull error %d, %d", this, res, info[0].status);
|
||||
|
||||
for (walk = priv->ports; walk; walk = g_list_next (walk)) {
|
||||
SourcePortData *data = walk->data;
|
||||
walk = pinos_node_get_ports (PINOS_NODE (this));
|
||||
for (; walk; walk = g_list_next (walk)) {
|
||||
PinosPort *port = walk->data;
|
||||
GError *error = NULL;
|
||||
|
||||
if (!pinos_port_send_buffer (data->port, info[0].buffer_id, &error)) {
|
||||
if (!pinos_port_send_buffer (port, info[0].buffer_id, &error)) {
|
||||
g_debug ("send failed: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
|
|
@ -309,8 +300,7 @@ set_property (GObject *object,
|
|||
static gboolean
|
||||
on_activate (PinosPort *port, gpointer user_data)
|
||||
{
|
||||
SourcePortData *data = user_data;
|
||||
PinosSpaV4l2Source *source = data->source;
|
||||
PinosSpaV4l2Source *source = user_data;
|
||||
|
||||
pinos_node_report_busy (PINOS_NODE (source));
|
||||
|
||||
|
|
@ -320,39 +310,17 @@ on_activate (PinosPort *port, gpointer user_data)
|
|||
static void
|
||||
on_deactivate (PinosPort *port, gpointer user_data)
|
||||
{
|
||||
SourcePortData *data = user_data;
|
||||
PinosSpaV4l2Source *source = data->source;
|
||||
PinosSpaV4l2Source *source = user_data;
|
||||
|
||||
pinos_node_report_idle (PINOS_NODE (source));
|
||||
}
|
||||
|
||||
static void
|
||||
free_source_port_data (SourcePortData *data)
|
||||
{
|
||||
g_slice_free (SourcePortData, data);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
remove_port (PinosNode *node,
|
||||
guint id)
|
||||
{
|
||||
PinosSpaV4l2Source *source = PINOS_SPA_V4L2_SOURCE (node);
|
||||
PinosSpaV4l2SourcePrivate *priv = source->priv;
|
||||
GList *walk;
|
||||
|
||||
for (walk = priv->ports; walk; walk = g_list_next (walk)) {
|
||||
SourcePortData *data = walk->data;
|
||||
|
||||
if (data->id == id) {
|
||||
free_source_port_data (data);
|
||||
priv->ports = g_list_delete_link (priv->ports, walk);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (priv->ports == NULL)
|
||||
pinos_node_report_idle (node);
|
||||
|
||||
return TRUE;
|
||||
return PINOS_NODE_CLASS (pinos_spa_v4l2_source_parent_class)
|
||||
->remove_port (node, id);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -417,26 +385,18 @@ add_port (PinosNode *node,
|
|||
GError **error)
|
||||
{
|
||||
PinosSpaV4l2Source *source = PINOS_SPA_V4L2_SOURCE (node);
|
||||
PinosSpaV4l2SourcePrivate *priv = source->priv;
|
||||
SourcePortData *data;
|
||||
PinosPort *port;
|
||||
|
||||
data = g_slice_new0 (SourcePortData);
|
||||
data->source = source;
|
||||
data->id = id;
|
||||
data->have_format = FALSE;
|
||||
|
||||
data->port = PINOS_NODE_CLASS (pinos_spa_v4l2_source_parent_class)
|
||||
port = PINOS_NODE_CLASS (pinos_spa_v4l2_source_parent_class)
|
||||
->add_port (node, direction, id, error);
|
||||
|
||||
pinos_port_set_received_cb (data->port, on_received_buffer, on_received_event, node, NULL);
|
||||
pinos_port_set_received_cb (port, on_received_buffer, on_received_event, node, NULL);
|
||||
|
||||
g_debug ("connecting signals");
|
||||
g_signal_connect (data->port, "activate", (GCallback) on_activate, data);
|
||||
g_signal_connect (data->port, "deactivate", (GCallback) on_deactivate, data);
|
||||
g_signal_connect (port, "activate", (GCallback) on_activate, source);
|
||||
g_signal_connect (port, "deactivate", (GCallback) on_deactivate, source);
|
||||
|
||||
priv->ports = g_list_append (priv->ports, data);
|
||||
|
||||
return data->port;
|
||||
return port;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include "pinos/server/daemon.h"
|
||||
#include "pinos/server/client-node.h"
|
||||
#include "pinos/server/utils.h"
|
||||
#include "pinos/server/link.h"
|
||||
|
||||
#include "pinos/dbus/org-pinos.h"
|
||||
|
||||
|
|
@ -174,8 +175,6 @@ static gboolean
|
|||
on_received_buffer (PinosPort *port, uint32_t buffer_id, GError **error, gpointer user_data)
|
||||
{
|
||||
PinosNode *node = user_data;
|
||||
PinosClientNode *this = PINOS_CLIENT_NODE (node);
|
||||
PinosClientNodePrivate *priv = this->priv;
|
||||
SpaResult res;
|
||||
SpaInputInfo info[1];
|
||||
|
||||
|
|
@ -195,8 +194,6 @@ static gboolean
|
|||
on_received_event (PinosPort *port, SpaEvent *event, GError **error, gpointer user_data)
|
||||
{
|
||||
PinosNode *node = user_data;
|
||||
PinosClientNode *this = PINOS_CLIENT_NODE (node);
|
||||
PinosClientNodePrivate *priv = this->priv;
|
||||
SpaResult res;
|
||||
|
||||
if ((res = spa_node_port_push_event (node->node, port->id, event)) < 0)
|
||||
|
|
@ -271,6 +268,45 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
|
|||
PinosClientNodePrivate *priv = this->priv;
|
||||
|
||||
switch (event->type) {
|
||||
case SPA_EVENT_TYPE_PORT_ADDED:
|
||||
{
|
||||
SpaEventPortAdded *pa = event->data;
|
||||
PinosPort *port, *target;
|
||||
PinosLink *link;
|
||||
PinosNode *pnode = PINOS_NODE (this);
|
||||
GError *error = NULL;
|
||||
|
||||
port = PINOS_NODE_CLASS (pinos_client_node_parent_class)->add_port (pnode,
|
||||
pa->direction,
|
||||
event->port_id,
|
||||
&error);
|
||||
|
||||
if (port == NULL) {
|
||||
g_warning ("proxy %p: can't create port: %s", this, error->message);
|
||||
g_clear_error (&error);
|
||||
break;
|
||||
}
|
||||
pinos_port_set_received_cb (port, on_received_buffer, on_received_event, this, NULL);
|
||||
|
||||
target = pinos_daemon_find_port (pinos_node_get_daemon (pnode),
|
||||
pinos_direction_reverse (pa->direction),
|
||||
"/org/pinos/node_8",
|
||||
NULL,
|
||||
NULL,
|
||||
&error);
|
||||
if (target == NULL) {
|
||||
g_warning ("proxy %p: can't find port target: %s", this, error->message);
|
||||
g_clear_error (&error);
|
||||
break;
|
||||
}
|
||||
link = pinos_link_new (pinos_node_get_daemon (pnode), port, target, NULL);
|
||||
|
||||
break;
|
||||
}
|
||||
case SPA_EVENT_TYPE_PORT_REMOVED:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case SPA_EVENT_TYPE_STATE_CHANGE:
|
||||
{
|
||||
SpaEventStateChange *sc = event->data;
|
||||
|
|
|
|||
|
|
@ -187,7 +187,6 @@ handle_create_client_node (PinosDaemon1 *interface,
|
|||
GDBusMethodInvocation *invocation,
|
||||
const gchar *arg_name,
|
||||
GVariant *arg_properties,
|
||||
GVariant *arg_ports,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosDaemon *daemon = user_data;
|
||||
|
|
@ -210,56 +209,11 @@ handle_create_client_node (PinosDaemon1 *interface,
|
|||
arg_name,
|
||||
props);
|
||||
|
||||
client = sender_get_client (daemon, sender);
|
||||
|
||||
{
|
||||
GVariantIter it;
|
||||
guint direction;
|
||||
guint id;
|
||||
const gchar *format_str, *target_node;
|
||||
GVariant *port_props;
|
||||
|
||||
g_variant_iter_init (&it, arg_ports);
|
||||
while (g_variant_iter_loop (&it, "(uu&s@a{sv}&s)", &direction, &id, &format_str, &port_props, &target_node)) {
|
||||
PinosPort *port, *target;
|
||||
PinosProperties *pprops;
|
||||
GBytes *formats;
|
||||
PinosLink *link;
|
||||
|
||||
port = pinos_node_add_port (node, direction, id, &error);
|
||||
if (port == NULL)
|
||||
goto add_failed;
|
||||
|
||||
pprops = pinos_properties_from_variant (port_props);
|
||||
formats = g_bytes_new (format_str, strlen (format_str) + 1);
|
||||
|
||||
g_object_set (port, "possible-formats", formats,
|
||||
"properties", port_props,
|
||||
NULL);
|
||||
|
||||
target = pinos_daemon_find_port (daemon,
|
||||
pinos_direction_reverse (direction),
|
||||
target_node,
|
||||
pprops,
|
||||
formats,
|
||||
&error);
|
||||
if (target == NULL) {
|
||||
g_warning ("daemon %p: can't find port target: %s", daemon, error->message);
|
||||
g_clear_error (&error);
|
||||
continue;
|
||||
}
|
||||
|
||||
// pinos_client_add_object (client, G_OBJECT (target));
|
||||
|
||||
link = pinos_link_new (daemon, port, target, NULL);
|
||||
pinos_client_add_object (client, G_OBJECT (link));
|
||||
}
|
||||
}
|
||||
|
||||
socket = pinos_client_node_get_socket_pair (PINOS_CLIENT_NODE (node), &error);
|
||||
if (socket == NULL)
|
||||
goto no_socket;
|
||||
|
||||
client = sender_get_client (daemon, sender);
|
||||
pinos_client_add_object (client, G_OBJECT (node));
|
||||
|
||||
object_path = pinos_node_get_object_path (PINOS_NODE (node));
|
||||
|
|
@ -279,11 +233,6 @@ no_socket:
|
|||
g_debug ("daemon %p: could not create node %s", daemon, error->message);
|
||||
goto exit_error;
|
||||
}
|
||||
add_failed:
|
||||
{
|
||||
g_debug ("daemon %p: failed to add port %s", daemon, error->message);
|
||||
goto exit_error;
|
||||
}
|
||||
exit_error:
|
||||
{
|
||||
g_dbus_method_invocation_return_gerror (invocation, error);
|
||||
|
|
|
|||
|
|
@ -81,6 +81,12 @@ node_set_state (PinosNode *node,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
do_remove_port (PinosPort *port, PinosNode *node)
|
||||
{
|
||||
pinos_node_remove_port (node, port->id);
|
||||
}
|
||||
|
||||
static PinosPort *
|
||||
node_add_port (PinosNode *node,
|
||||
PinosDirection direction,
|
||||
|
|
@ -96,6 +102,10 @@ node_add_port (PinosNode *node,
|
|||
"direction", direction,
|
||||
"id", id,
|
||||
NULL);
|
||||
if (port) {
|
||||
g_hash_table_insert (priv->ports, GUINT_TO_POINTER (id), port);
|
||||
g_signal_connect (port, "remove", (GCallback) do_remove_port, node);
|
||||
}
|
||||
return port;
|
||||
}
|
||||
|
||||
|
|
@ -103,6 +113,9 @@ static gboolean
|
|||
node_remove_port (PinosNode *node,
|
||||
guint id)
|
||||
{
|
||||
PinosNodePrivate *priv = node->priv;
|
||||
g_debug ("node %p: removed port %u", node, id);
|
||||
g_hash_table_remove (priv->ports, GUINT_TO_POINTER (id));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -670,12 +683,6 @@ pinos_node_remove (PinosNode *node)
|
|||
g_signal_emit (node, signals[SIGNAL_REMOVE], 0, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
do_remove_port (PinosPort *port, PinosNode *node)
|
||||
{
|
||||
pinos_node_remove_port (node, port->id);
|
||||
}
|
||||
|
||||
/**
|
||||
* pinos_node_add_port:
|
||||
* @node: a #PinosNode
|
||||
|
|
@ -693,11 +700,9 @@ pinos_node_add_port (PinosNode *node,
|
|||
GError **error)
|
||||
{
|
||||
PinosNodeClass *klass;
|
||||
PinosNodePrivate *priv;
|
||||
PinosPort *port;
|
||||
|
||||
g_return_val_if_fail (PINOS_IS_NODE (node), NULL);
|
||||
priv = node->priv;
|
||||
|
||||
klass = PINOS_NODE_GET_CLASS (node);
|
||||
if (!klass->add_port) {
|
||||
|
|
@ -708,10 +713,6 @@ pinos_node_add_port (PinosNode *node,
|
|||
g_debug ("node %p: add port", node);
|
||||
port = klass->add_port (node, direction, id, error);
|
||||
|
||||
if (port) {
|
||||
g_hash_table_insert (priv->ports, GUINT_TO_POINTER (id), port);
|
||||
g_signal_connect (port, "remove", (GCallback) do_remove_port, node);
|
||||
}
|
||||
return port;
|
||||
}
|
||||
|
||||
|
|
@ -727,12 +728,10 @@ pinos_node_add_port (PinosNode *node,
|
|||
gboolean
|
||||
pinos_node_remove_port (PinosNode *node, guint id)
|
||||
{
|
||||
PinosNodePrivate *priv;
|
||||
PinosNodeClass *klass;
|
||||
gboolean res = FALSE;
|
||||
|
||||
g_return_val_if_fail (PINOS_IS_NODE (node), FALSE);
|
||||
priv = node->priv;
|
||||
|
||||
klass = PINOS_NODE_GET_CLASS (node);
|
||||
|
||||
|
|
@ -740,10 +739,6 @@ pinos_node_remove_port (PinosNode *node, guint id)
|
|||
return FALSE;
|
||||
|
||||
res = klass->remove_port (node, id);
|
||||
if (res) {
|
||||
g_debug ("node %p: removed port %u", node, id);
|
||||
g_hash_table_remove (priv->ports, GUINT_TO_POINTER (id));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue