Changeset 4f7b78388fa1a85e4868c979c0b8bdbeac685417

Timestamp:

12/27/10 06:16:10 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

3a5b7037d88ca19b2003cba39fa7a4ed2bbfae0c

Parents:

1958d74f7cc4036afe4870d55e7fdaadee27f5b9

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-27T06:08:04Z+0200

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-27T06:16:10Z+0200

Message:

ladish_control: vgraph connection management. #125

Files:

• daemon/graph.c (modified) (3 diffs)
• ladish_control (modified) (4 diffs)

daemon/graph.c

@@ -196 +196 @@
 }
 
+static
+bool
+ladish_graph_find_connection_ports_by_name_internal(
+  struct ladish_graph * graph_ptr,
+  const char * client1_name,
+  const char * port1_name,
+  const char * client2_name,
+  const char * port2_name,
+  struct ladish_graph_port ** port1_ptr_ptr,
+  struct ladish_graph_port ** port2_ptr_ptr)
+{
+  struct list_head * client1_node_ptr;
+  struct ladish_graph_client * client1_ptr;
+  struct list_head * port1_node_ptr;
+  struct ladish_graph_port * port1_ptr;
+  struct list_head * client2_node_ptr;
+  struct ladish_graph_client * client2_ptr;
+  struct list_head * port2_node_ptr;
+  struct ladish_graph_port * port2_ptr;
+
+  /*
+   * Port names are not unique, so in order to find best match,
+   * ports are searched with these assumptions:
+   *
+   *  1. port1 and port2 are of same type (midi or audio)
+   *  2. port1 is a source (capture, output) port
+   *  3. port2 is a destination (playback, input) port
+   *
+   * all these conditions have to be met for a port pair to match
+   */
+  list_for_each(client1_node_ptr, &graph_ptr->clients)
+  {
+    client1_ptr = list_entry(client1_node_ptr, struct ladish_graph_client, siblings);
+    if (strcmp(client1_ptr->name, client1_name) == 0)
+    {
+      list_for_each(port1_node_ptr, &client1_ptr->ports)
+      {
+        port1_ptr = list_entry(port1_node_ptr, struct ladish_graph_port, siblings_client);
+        if (JACKDBUS_PORT_IS_OUTPUT(port1_ptr->flags) &&
+            strcmp(port1_ptr->name, port1_name) == 0)
+        {
+          list_for_each(client2_node_ptr, &graph_ptr->clients)
+          {
+            client2_ptr = list_entry(client2_node_ptr, struct ladish_graph_client, siblings);
+            if (strcmp(client2_ptr->name, client2_name) == 0)
+            {
+              list_for_each(port2_node_ptr, &client2_ptr->ports)
+              {
+                port2_ptr = list_entry(port2_node_ptr, struct ladish_graph_port, siblings_client);
+                if (port2_ptr->type == port1_ptr->type &&
+                    JACKDBUS_PORT_IS_INPUT(port2_ptr->flags) &&
+                    strcmp(port2_ptr->name, port2_name) == 0)
+                {
+                  *port1_ptr_ptr = port1_ptr;
+                  *port2_ptr_ptr = port2_ptr;
+                  return true;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+static
+bool
+ladish_graph_find_connection_ports_by_name(
+  struct ladish_graph * graph_ptr,
+  const char * client1_name,
+  const char * port1_name,
+  const char * client2_name,
+  const char * port2_name,
+  struct ladish_graph_port ** port1_ptr_ptr,
+  struct ladish_graph_port ** port2_ptr_ptr)
+{
+  if (ladish_graph_find_connection_ports_by_name_internal(
+        graph_ptr,
+        client1_name,
+        port1_name,
+        client2_name,
+        port2_name,
+        port1_ptr_ptr,
+        port2_ptr_ptr))
+  {
+    return true;
+  }
+
+  if (ladish_graph_find_connection_ports_by_name_internal(
+        graph_ptr,
+        client2_name,
+        port2_name,
+        client1_name,
+        port1_name,
+        port1_ptr_ptr,
+        port2_ptr_ptr))
+  {
+    return true;
+  }
+
+  return false;
+}
+
 static struct ladish_graph_port * ladish_graph_find_port_by_id_internal(struct ladish_graph * graph_ptr, uint64_t port_id)
 {
@@ -614 +720 @@
 static void connect_ports_by_name(struct dbus_method_call * call_ptr)
 {
-  log_info("connect_ports_by_name() called.");
-  lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "connect by name is not implemented yet");
+  const char * client1_name;
+  const char * port1_name;
+  const char * client2_name;
+  const char * port2_name;
+  struct ladish_graph_port * port1;
+  struct ladish_graph_port * port2;
+
+  if (!dbus_message_get_args(
+        call_ptr->message,
+        &g_dbus_error,
+        DBUS_TYPE_STRING, &client1_name,
+        DBUS_TYPE_STRING, &port1_name,
+        DBUS_TYPE_STRING, &client2_name,
+        DBUS_TYPE_STRING, &port2_name,
+        DBUS_TYPE_INVALID))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s", call_ptr->method_name, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+    return;
+  }
+
+  log_info("connect_ports_by_name(\"%s\", \"%s\", \"%s\", \"%s\") called.", client1_name, port1_name, client2_name, port2_name);
+
+  if (!ladish_graph_find_connection_ports_by_name(graph_ptr, client1_name, port1_name, client2_name, port2_name, &port1, &port2))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Cannot connect unknown ports");
+    return;
+  }
+
+  if (graph_ptr->connect_handler(graph_ptr->context, (ladish_graph_handle)graph_ptr, port1->port, port2->port))
+  {
+    method_return_new_void(call_ptr);
+  }
+  else
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "connect failed");
+  }
 }
 
@@ -689 +830 @@
 static void disconnect_ports_by_name(struct dbus_method_call * call_ptr)
 {
-  log_info("disconnect_ports_by_name() called.");
-  lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "disconnect by name is not implemented yet");
+  const char * client1_name;
+  const char * port1_name;
+  const char * client2_name;
+  const char * port2_name;
+  struct ladish_graph_port * port1;
+  struct ladish_graph_port * port2;
+  struct ladish_graph_connection * connection_ptr;
+
+  if (!dbus_message_get_args(
+        call_ptr->message,
+        &g_dbus_error,
+        DBUS_TYPE_STRING, &client1_name,
+        DBUS_TYPE_STRING, &port1_name,
+        DBUS_TYPE_STRING, &client2_name,
+        DBUS_TYPE_STRING, &port2_name,
+        DBUS_TYPE_INVALID))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s", call_ptr->method_name, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+    return;
+  }
+
+  log_info("disconnect_ports_by_name(\"%s\", \"%s\", \"%s\", \"%s\") called.", client1_name, port1_name, client2_name, port2_name);
+
+  if (!ladish_graph_find_connection_ports_by_name(graph_ptr, client1_name, port1_name, client2_name, port2_name, &port1, &port2))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Cannot disconnect unknown ports");
+    return;
+  }
+
+  connection_ptr = ladish_graph_find_connection_by_ports(graph_ptr, port1, port2);
+  if (connection_ptr == NULL)
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Cannot disconnect not connected ports");
+    return;
+  }
+
+  disconnect_ports(call_ptr, connection_ptr);
 }
 

ladish_control

@@ -33 +33 @@
 app_supervisor_interface_name = 'org.ladish.AppSupervisor'
 room_interface_name = 'org.ladish.Room'
+patchbay_interface_name = 'org.jackaudio.JackPatchbay'
 
 import sys
@@ -140 +141 @@
         if name == room_name:
             return bus.get_object(service_name, opath)
+
+def dump_graph(obj):
+    patchbay_iface = dbus.Interface(obj, patchbay_interface_name)
+    graph = patchbay_iface.GetGraph(0)
+    for client in graph[1]:
+        print '"%s"' % client[1]
+        for port in client[2]:
+            print '  "%s"' % port[1]
+    print
+    if len(graph[2]):
+        if len(graph[2]) == 1:
+            print "1 connection:"
+        else:
+            print "%u connections:" % len(graph[2])
+        for connection in graph[2]:
+            print '"%s":"%s" -> "%s":"%s"' % (connection[1], connection[3], connection[5], connection[7])
+    else:
+        print "0 connections."
 
 def main():
@@ -171 +190 @@
         print("    snewapp <appargs>         - add new app to studio (see below for more info)")
         print("    rnewapp <rname> <appargs> - add new app to room (see below for more info)")
+        print("    sgdump                    - studio graph dump")
+        print("    rgdump <rname>            - room graph dump")
+        print("    sconnect <client1> <port1> <client2> <port2>            - connect ports in studio");
+        print("    sdisconnect <client1> <port1> <client2> <port2>         - disconnect ports in studio");
+        print("    rconnect <rname> <client1> <port1> <client2> <port2>    - connect ports in studio");
+        print("    rdisconnect <rname> <client1> <port1> <client2> <port2> - disconnect ports in room");
         print("");
         print("Add new app arguments:");
@@ -416 +441 @@
 
                     add_app(get_room_obj_by_name(bus, studio_iface, arg), cmdline, name, level, term)
+                elif arg == "sgdump":
+                    print('--- dump studio graph')
+                    dump_graph(studio_obj)
+                elif arg == "rgdump":
+                    if index >= len(sys.argv):
+                        print("rconnect command requires rname, client1, port1, client2 and port2 arguments")
+                        sys.exit()
+                    rname = sys.argv[index]
+                    index += 1
+                    print('--- dump room "' + rname + '" graph')
+                    room_obj = get_room_obj_by_name(bus, studio_obj, rname)
+                    dump_graph(room_obj)
+                elif arg == "sconnect":
+                    if index + 4 > len(sys.argv):
+                        print("sconnect command requires client1, port1, client2 and port2 arguments")
+                        sys.exit()
+                    c1 = sys.argv[index]
+                    p1 = sys.argv[index + 1]
+                    c2 = sys.argv[index + 2]
+                    p2 = sys.argv[index + 3]
+                    index += 4
+                    print('--- connect studio port "' + c1 + '":"' + p1 + '" to "' + c2 + '":"' + p2 + '"')
+                    patchbay_iface = dbus.Interface(studio_obj, patchbay_interface_name)
+                    patchbay_iface.ConnectPortsByName(c1, p1, c2, p2)
+                elif arg == "sdisconnect":
+                    if index + 4 > len(sys.argv):
+                        print("sdisconnect command requires client1, port1, client2 and port2 arguments")
+                        sys.exit()
+                    c1 = sys.argv[index]
+                    p1 = sys.argv[index + 1]
+                    c2 = sys.argv[index + 2]
+                    p2 = sys.argv[index + 3]
+                    index += 4
+                    print('--- disconnect studio port "' + c2 + '":"' + p2 + '" from "' + c1 + '":"' + p1 + '"')
+                    patchbay_iface = dbus.Interface(studio_obj, patchbay_interface_name)
+                    patchbay_iface.DisconnectPortsByName(c1, p1, c2, p2)
+                elif arg == "rconnect":
+                    if index + 5 > len(sys.argv):
+                        print("rconnect command requires rname, client1, port1, client2 and port2 arguments")
+                        sys.exit()
+                    rname = sys.argv[index]
+                    c1 = sys.argv[index + 1]
+                    p1 = sys.argv[index + 2]
+                    c2 = sys.argv[index + 3]
+                    p2 = sys.argv[index + 4]
+                    index += 5
+                    print('--- connect room "' + rname + '" port "' + c1 + '":"' + p1 + '" to "' + c2 + '":"' + p2 + '"')
+                    room_obj = get_room_obj_by_name(bus, studio_iface, rname)
+                    patchbay_iface = dbus.Interface(room_obj, patchbay_interface_name)
+                    patchbay_iface.ConnectPortsByName(c1, p1, c2, p2)
+                elif arg == "rdisconnect":
+                    if index + 5 > len(sys.argv):
+                        print("rdisconnect command requires rname, client1, port1, client2 and port2 arguments")
+                        sys.exit()
+                    rname = sys.argv[index]
+                    c1 = sys.argv[index + 1]
+                    p1 = sys.argv[index + 2]
+                    c2 = sys.argv[index + 3]
+                    p2 = sys.argv[index + 4]
+                    index += 5
+                    print('--- disconnect room "' + rname + '" port "' + c2 + '":"' + p2 + '" from "' + c1 + '":"' + p1 + '"')
+                    room_obj = get_room_obj_by_name(bus, studio_iface, rname)
+                    patchbay_iface = dbus.Interface(room_obj, patchbay_interface_name)
+                    patchbay_iface.DisconnectPortsByName(c1, p1, c2, p2)
                 else:
                     print("Unknown command '%s'" % arg)