LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ladishd: graph calls to virtualizer for connect/disconnect

This commit is contained in:
Nedko Arnaudov 2009-11-28 18:36:07 +02:00
parent 8e6f044d74
commit 5955c05ca0
3 changed files with 74 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
daemon/graph.c
View File

@ -63,6 +63,10 @@ struct ladish_graph
uint64_t next_client_id;
uint64_t next_port_id;
uint64_t next_connection_id;
void * context;
ladish_graph_connect_request_handler connect_handler;
ladish_graph_disconnect_request_handler disconnect_handler;
};
struct ladish_graph_port * ladish_graph_find_port_by_id_internal(struct ladish_graph * graph_ptr, uint64_t port_id)
@ -392,6 +396,12 @@ static void connect_ports_by_id(struct dbus_method_call * call_ptr)
log_info("connect_ports_by_id(%"PRIu64",%"PRIu64") called.", port1_id, port2_id);
if (graph_ptr->connect_handler == NULL)
{
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "connect requests on this graph cannot be handlined");
return;
}
port1_ptr = ladish_graph_find_port_by_id_internal(graph_ptr, port1_id);
if (port1_ptr == NULL)
{
@ -408,7 +418,14 @@ static void connect_ports_by_id(struct dbus_method_call * call_ptr)
log_info("connecting '%s':'%s' to '%s':'%s'", port1_ptr->client_ptr->name, port1_ptr->name, port2_ptr->client_ptr->name, port2_ptr->name);
method_return_new_void(call_ptr);
if (graph_ptr->connect_handler(graph_ptr->context, (ladish_graph_handle)graph_ptr, port1_ptr->port, port2_ptr->port))
{
method_return_new_void(call_ptr);
}
else
{
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "connect failed");
}
}
static void disconnect_ports_by_name(struct dbus_method_call * call_ptr)
@ -421,8 +438,6 @@ static void disconnect_ports_by_id(struct dbus_method_call * call_ptr)
{
dbus_uint64_t port1_id;
dbus_uint64_t port2_id;
struct ladish_graph_port * port1_ptr;
struct ladish_graph_port * port2_ptr;
if (!dbus_message_get_args(call_ptr->message, &g_dbus_error, DBUS_TYPE_UINT64, &port1_id, DBUS_TYPE_UINT64, &port2_id, DBUS_TYPE_INVALID))
{
@ -432,24 +447,7 @@ static void disconnect_ports_by_id(struct dbus_method_call * call_ptr)
}
log_info("disconnect_ports_by_id(%"PRIu64",%"PRIu64") called.", port1_id, port2_id);
port1_ptr = ladish_graph_find_port_by_id_internal(graph_ptr, port1_id);
if (port1_ptr == NULL)
{
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Cannot disconnect unknown port with id %"PRIu64, port1_id);
return;
}
port2_ptr = ladish_graph_find_port_by_id_internal(graph_ptr, port2_id);
if (port2_ptr == NULL)
{
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Cannot disconnect unknown port with id %"PRIu64, port2_id);
return;
}
log_info("disconnecting '%s':'%s' to '%s':'%s'", port1_ptr->client_ptr->name, port1_ptr->name, port2_ptr->client_ptr->name, port2_ptr->name);
method_return_new_void(call_ptr);
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "disconnect by ports id is not implemented yet");
}
static void disconnect_ports_by_connection_id(struct dbus_method_call * call_ptr)
@ -511,6 +509,10 @@ bool ladish_graph_create(ladish_graph_handle * graph_handle_ptr, const char * op
graph_ptr->next_port_id = 1;
graph_ptr->next_connection_id = 1;
graph_ptr->context = NULL;
graph_ptr->connect_handler = NULL;
graph_ptr->disconnect_handler = NULL;
*graph_handle_ptr = (ladish_graph_handle)graph_ptr;
return true;
}
@ -671,6 +673,18 @@ void ladish_graph_destroy(ladish_graph_handle graph_handle, bool destroy_ports)
free(graph_ptr);
}
void
ladish_graph_set_connection_handlers(
ladish_graph_handle graph_handle,
void * graph_context,
ladish_graph_connect_request_handler connect_handler,
ladish_graph_disconnect_request_handler disconnect_handler)
{
graph_ptr->context = graph_context;
graph_ptr->connect_handler = connect_handler;
graph_ptr->disconnect_handler = disconnect_handler;
}
void ladish_graph_clear(ladish_graph_handle graph_handle, bool destroy_ports)
{
struct ladish_graph_client * client_ptr;

23
daemon/graph.h
View File

@ -32,8 +32,31 @@
typedef struct ladish_graph_tag { int unused; } * ladish_graph_handle;
typedef
bool
(* ladish_graph_connect_request_handler)(
void * context,
ladish_graph_handle graph_handle,
ladish_port_handle port1,
ladish_port_handle port2);
typedef
bool
(* ladish_graph_disconnect_request_handler)(
void * context,
ladish_graph_handle graph_handle,
uint64_t connection_id);
bool ladish_graph_create(ladish_graph_handle * graph_handle_ptr, const char * opath);
void ladish_graph_destroy(ladish_graph_handle graph_handle, bool destroy_ports);
void
ladish_graph_set_connection_handlers(
ladish_graph_handle graph_handle,
void * graph_context,
ladish_graph_connect_request_handler connect_handler,
ladish_graph_disconnect_request_handler disconnect_handler);
void ladish_graph_clear(ladish_graph_handle graph_handle, bool destroy_ports);
void * ladish_graph_get_dbus_context(ladish_graph_handle graph_handle);
ladish_dict_handle ladish_graph_get_dict(ladish_graph_handle graph_handle);

16
daemon/virtualizer.c
View File

@ -312,6 +312,20 @@ static void port_disappeared(void * context, uint64_t client_id, uint64_t port_i
}
}
static bool ports_connect_request(void * context, ladish_graph_handle graph_handle, ladish_port_handle port1, ladish_port_handle port2)
{
ASSERT(graph_handle == virtualizer_ptr->studio_graph);
log_info("virtualizer: ports connect request");
return false;
}
static bool ports_disconnect_request(void * context, ladish_graph_handle graph_handle, uint64_t connection_id)
{
ASSERT(graph_handle == virtualizer_ptr->studio_graph);
log_info("virtualizer: ports disconnect request");
return false;
}
static void ports_connected(void * context, uint64_t client1_id, uint64_t port1_id, uint64_t client2_id, uint64_t port2_id)
{
log_info("ports_connected");
@ -362,6 +376,8 @@ ladish_virtualizer_create(
return false;
}
ladish_graph_set_connection_handlers(studio_graph, virtualizer_ptr, ports_connect_request, ports_disconnect_request);
*handle_ptr = (ladish_virtualizer_handle)virtualizer_ptr;
return true;
}