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

cleanups

Browse source 
Remove some unused things.
Work on shutdown.
This commit is contained in:
Wim Taymans 2016-09-01 10:04:25 +02:00
parent 9485bd77e7
commit 463954a299
17 changed files with 166 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pinos/server/daemon.c
View file

@ -248,6 +248,7 @@ handle_create_client_node (PinosDaemon1 *interface,
sender,
arg_name,
props);
pinos_properties_free (props);
socket = pinos_client_node_get_socket_pair (PINOS_CLIENT_NODE (node), &error);
if (socket == NULL)
@ -265,6 +266,7 @@ handle_create_client_node (PinosDaemon1 *interface,
fdlist = g_unix_fd_list_new ();
fdidx = g_unix_fd_list_append (fdlist, g_socket_get_fd (socket), &error);
g_object_unref (socket);
g_dbus_method_invocation_return_value_with_unix_fd_list (invocation,
g_variant_new ("(oh)", object_path, fdidx), fdlist);
@ -532,7 +534,7 @@ pinos_daemon_find_port (PinosDaemon *daemon,
{
PinosDaemonPrivate *priv;
PinosPort *best = NULL;
GList *nodes, *ports;
GList *nodes, *ports, *walk;
gboolean have_name, created_port = FALSE;
g_return_val_if_fail (PINOS_IS_DAEMON (daemon), NULL);
@ -557,8 +559,9 @@ pinos_daemon_find_port (PinosDaemon *daemon,
node_found = TRUE;
}
for (ports = pinos_node_get_ports (n); ports; ports = g_list_next (ports)) {
PinosPort *p = ports->data;
ports = pinos_node_get_ports (n);
for (walk = ports; walk; walk = g_list_next (walk)) {
PinosPort *p = walk->data;
PinosDirection dir;
g_object_get (p, "direction", &dir, NULL);
@ -572,6 +575,8 @@ pinos_daemon_find_port (PinosDaemon *daemon,
break;
}
}
g_list_free (ports);
if (best == NULL && node_found) {
guint id;